Merge remote-tracking branch 'origin/main' into posthog-code/share-cloud-task-foundations

# Conflicts:
#	packages/agent/src/gateway-models.test.ts

Author: richardsolomou

apps/code/snapshots.yml

@@ -344,14 +344,6 @@ snapshots:
         hash: v1.k4693efd2.602ee87d6d7a745d4b09d9e49bd12a70e52299b78ca97a48b5ca73a01532d801.F_1XKDzCxzMm_opEt9FvzczBb_2n-vyvOyGFXHGJmTk
     features-sessions-conversationview--with-pending-prompt--light:
         hash: v1.k4693efd2.1636dfc3ee0dd9d28065166f2fff0193f2d499692c74749d3afa7585aae898b5.YxTPa4CsqI2YuGLUdck8340ITZQrpna_C6z-SgII4Ws
-    features-sessions-scrollbarrail--pure--dark:
-        hash: v1.k4693efd2.6baec21b1942848a3a376d2b90ca106b2c1b94de74382b4cd05673695d2649ee.UDDPtLDf1J2E3d3Oiy9is77Nm5xRSIfB7q5z0uUZRSQ
-    features-sessions-scrollbarrail--pure--light:
-        hash: v1.k4693efd2.33f02943fdbb1ea9774881f8909b580ab03ba02749614c533af1bf51dd817dca.ieP2bhDz0U_PTB4M6Zplvit0XlSTFiUn083GYBFNuC0
-    features-sessions-scrollbarrail--scrollable-conversation--dark:
-        hash: v1.k4693efd2.203b62b52d6365d6ec222f7529c35b3f46b17cd07ca792a8ce2de594af4d589b.3dfpnVM8yxor1PNO5aPk0pxn5THZjK4otA6mbz3XhtA
-    features-sessions-scrollbarrail--scrollable-conversation--light:
-        hash: v1.k4693efd2.fa7ef9cbdb09aef6108efcd3606cee32d889b3ad3b8f8be1ac637aed4e80cc72.0XcIKzM-sZHVG9hTZkAHdnBIPSrBiKmjq56QRQ6nasc
     features-sessions-toolcallblock--create-new-file--dark:
         hash: v1.k4693efd2.8847f96037682460aba47f0e0f5113037918235fc98596933f2d1d06fd6f8f92.SHetexoVOtozsZGZQMcVbmpBlbk7M5D5Q0R_TJvPnyc
     features-sessions-toolcallblock--create-new-file--light:
@@ -569,17 +561,17 @@ snapshots:
     git-dialogs--sync-success--light:
         hash: v1.k4693efd2.8d79d77c9338aeaa73734836f0e17fde987f6d3239914f4013889d3110e5088d.Rq-w2o1uhes_a5hUWqMXeiDkfnoPCZPt932LkEQXCco
     loops-loopslistview--comprehensive--dark:
-        hash: v1.k4693efd2.3c2a6b87092674a3d395a6f5d36889ea231696d788b159f357be0926f3804c8a.Ihzlq7XIy9rRoA7DTbpLePlBhjP34o8ppgP__NXx-Yw
+        hash: v1.k4693efd2.b9223e477701b5ef4587310a1de71500dd5214222531648ef76d66766b049a9f.2lckIm16WmmwZv1xVZnUL42InIHDzemQwU3EJzzw9_U
     loops-loopslistview--comprehensive--light:
-        hash: v1.k4693efd2.42c2994def56651de08f5be20e98dbe67bfbdb03e7edd8bdf008401468c1653a.EnH7NwNkvclS7g5Htf7OCZuYEm7fI5W6hEr4DmwZC8I
+        hash: v1.k4693efd2.1f172c831aefdfd4b3bae97af84f80aae3c09c4919f6b1b68315240cc482af50.hnrwbv8il_Ay6DcYxmQXNtxKU3rqOIWAkjnGB8n4AT4
     loops-loopslistview--long-mixed-list--dark:
-        hash: v1.k4693efd2.384486583f8d9b66a4bf1d9cc45036a07310cb9e1943ea5b52ff466f55a03d7b.F_sXrJ13XWHzAF8yhoKun_k4BY8Jcb3EDtT0L1I6nKw
+        hash: v1.k4693efd2.654250bc74fff46c496747eb13031e0e7a7ef264be5bb7be41451d82a497a515.vvrxXbbABkVY3hcHS3oThQ339JFgwIzB8E4n1usVWf0
     loops-loopslistview--long-mixed-list--light:
-        hash: v1.k4693efd2.d80a0c55c4490276df53f781ac88ed9d9c6ec282bc14ddb80140b3ddcc44d32f.L6hw9ZixUiyTFKOybYzmjfUSIOayvmhueMTcmYt-IWo
+        hash: v1.k4693efd2.a8e53087efdaf58e351809775aaf410f53a781a97e10e973ee53fd0db2f94e73.7GcprWAYAgATLtNckNBd-44EyctqKNcb4FXiHA08QJs
     loops-loopslistview--with-builder-sessions--dark:
-        hash: v1.k4693efd2.bc59812bf49ff161cf20e75dcf043367ae3d2817aa2c2cf91c91d9771c6b62f8.yOBz-llmwDVay7GIHlMwlMT3EuKjkoW0Vwmwvi4noCM
+        hash: v1.k4693efd2.84cfc28bedc22a6728ba4ecf69274ab03537faeed5333775991716bf0b5f439e.fHsD0XKPnud-oDM4PLJ7edCbMnVcW6uVMdMHBYp3K08
     loops-loopslistview--with-builder-sessions--light:
-        hash: v1.k4693efd2.fb97e3fe3205ddf71d98c4e35446c73e394aaa9761d3bb35b146ddafc438df4d.UUEWc0G12NQibZTyskIHGS62mB36gKJ594GrJp1E9II
+        hash: v1.k4693efd2.fb6c9b85bd660a6be4645cf7ba8fe3ab08a169e3823e5354325b7d7ecbe13aba.4FbKrdxiUN1PZOGwFa_kl7Rpz3Z8DnTVNJvUM_3FIp0
     scouts-scoutsfleetlist--filtered-to-you--dark:
         hash: v1.k4693efd2.a3af6e76ef36598eaa347bedc4430878ed62754660166398e0576a9978cd084b.x3Ky-O6HOw0srWdOmnnKJwFNpmGmQVWip0t7CwVaRXY
     scouts-scoutsfleetlist--filtered-to-you--light:

apps/mobile/src/features/tasks/composer/options.ts

@@ -42,10 +42,16 @@ export const MODELS: ModelOption[] = [
     description: "Newest, most capable",
     supportsReasoning: true,
   },
+  {
+    value: "claude-opus-5",
+    label: "Claude Opus 5",
+    description: "Most capable, slower",
+    supportsReasoning: true,
+  },
   {
     value: "claude-opus-4-8",
     label: "Claude Opus 4.8",
-    description: "Most capable, slower",
+    description: "Previous Opus generation",
     supportsReasoning: true,
   },
   {

apps/mobile/src/lib/githubIssueUrl.ts

@@ -9,23 +9,28 @@ export interface ParsedGithubIssueUrl {
 }
 
 const GITHUB_ISSUE_URL_PATTERN =
-  /^https?:\/\/github\.com\/([^/\s]+)\/([^/\s]+)\/(issues|pull)\/(\d+)(?:[/?#].*)?$/;
+  /^https?:\/\/github\.com\/([^/\s]+)\/([^/\s]+)\/(issues|pull)\/(\d+)([/?#].*)?$/;
 
 export function parseGithubIssueUrl(text: string): ParsedGithubIssueUrl | null {
   const trimmed = text.trim();
   const match = trimmed.match(GITHUB_ISSUE_URL_PATTERN);
   if (!match) return null;
 
-  const [, owner, repo, segment, rawNumber] = match;
+  const [, owner, repo, segment, rawNumber, suffix = ""] = match;
   const number = Number(rawNumber);
   if (!Number.isInteger(number) || number <= 0) return null;
 
   const kind: GithubRefKind = segment === "pull" ? "pr" : "issue";
+  // A fragment like #discussion_r123 anchors a specific comment, so keep the
+  // whole suffix — anchors such as #r123 only resolve on the /files subpage
+  // they were copied from. Without a fragment the tab/query suffix is noise.
+  const hashIndex = suffix.indexOf("#");
+  const hasFragment = hashIndex !== -1 && hashIndex < suffix.length - 1;
   return {
     kind,
     owner,
     repo,
     number,
-    normalizedUrl: `https://github.com/${owner}/${repo}/${segment}/${number}`,
+    normalizedUrl: `https://github.com/${owner}/${repo}/${segment}/${number}${hasFragment ? suffix : ""}`,
   };
 }

packages/agent/README.md

@@ -171,6 +171,16 @@ Required environment variables (validated by zod in `src/server/bin.ts`):
 - `POSTHOG_PERSONAL_API_KEY` — API key for PostHog requests
 - `POSTHOG_PROJECT_ID` — numeric project ID
 
+Optional run telemetry (the logs pair must both be set, otherwise telemetry stays off):
+
+- `POSTHOG_AGENT_OTEL_LOGS_URL` — full OTLP logs URL for run metadata, e.g. `https://us.i.posthog.com/i/v1/logs`
+- `POSTHOG_AGENT_OTEL_LOGS_TOKEN` — project API key of the telemetry project
+- `POSTHOG_AGENT_OTEL_TRACES_URL` — full OTLP traces URL, e.g. `https://us.i.posthog.com/i/v1/traces`; additionally enables one APM trace per run
+
+When set, `AgentServer` ships an allowlisted metadata subset of the session log (run/turn/tool lifecycle, usage, error provenance — never message content, tool arguments, or raw error text; see `src/otel-telemetry.ts`) to PostHog Logs, tagged with `service.name=posthog-code-agent` and `run_id`/`task_id`/`team_id`/`user_id`/`distinct_id` resource attributes so cloud runs are filterable per user. With the traces URL set, each run also produces an APM trace (`task_run` root span, a `turn` span per prompt, a `tool_call:<kind>` span per tool call; see `src/otel-trace-builder.ts`), and log records carry the matching trace/span ids so Logs and APM cross-link.
+
+The `task_run` root span is ended and exported at the run's in-process terminal point — a background run's prompt settling, a terminal failure, or session cleanup (`close`). It cannot wait for teardown: agent-server is an exec'd process inside the sandbox, so `docker stop` / Modal terminate kill it without SIGTERM ever arriving, and a span still open at that moment is lost. Interactive sessions that end via hard teardown (e.g. inactivity timeout) therefore lose the root span; turn/tool spans and logs still assemble under the same trace id.
+
 ## Agent SDK
 
 The `Agent` class (`src/agent.ts`) is the entrypoint for local/programmatic usage. It handles LLM gateway configuration, log writer setup, and model filtering — then delegates to `createAcpConnection()`.
@@ -209,12 +219,9 @@ Logs serve two purposes: real-time observability and session resume. Every ACP m
 
 ### Writing logs
 
-`SessionLogWriter` (`src/session-log-writer.ts`) is a per-session multiplexer that buffers raw ndJson lines. On flush (auto-scheduled 500ms after writes, or explicit), it dispatches to whichever backend is configured:
-
-- **OTEL** (`src/otel-log-writer.ts`) — preferred path. Creates an OpenTelemetry `LoggerProvider` per session with resource attributes (`task_id`, `run_id`, `device_type`) set once and indexed via `resource_fingerprint`. Each ndJson line is emitted as an OTEL log record with an `event_type` attribute (the ACP method name) and exported via OTLP HTTP to PostHog's `/i/v1/agent-logs` endpoint. Batch flush interval defaults to 500ms.
-- **Legacy S3** — falls back to `PostHogAPIClient.appendTaskRunLog()`, which POSTs batched `StoredNotification` entries to the Django API. The API stores them as the task run's `log_url`.
+`SessionLogWriter` (`src/session-log-writer.ts`) is a per-session multiplexer that buffers raw ndJson lines. On flush (auto-scheduled 500ms after writes, or explicit), it POSTs batched `StoredNotification` entries to the Django API via `PostHogAPIClient.appendTaskRunLog()`; the API stores them in S3 as the task run's `log_url`. This S3 log is the source of truth for the full transcript and for session resume.
 
-Both backends can be active simultaneously — OTEL for fast indexed queries, S3 for full log download.
+Independently of that flush cycle, the writer tees every parsed non-chunk entry to optional `SessionLogSink`s at append time. In cloud, `OtelRunTelemetry` (`src/otel-telemetry.ts`) is wired as a sink and exports an allowlisted metadata subset (run/turn/tool lifecycle, usage, error provenance — never message content, tool arguments, or raw error text) to PostHog Logs, plus an APM trace per run when configured. See "Optional run telemetry" above for the env vars and behavior. Sink failures can never break S3 log persistence.
 
 ### Resuming from logs
 

packages/agent/package.json

@@ -163,10 +163,13 @@
     "@earendil-works/pi-coding-agent": "catalog:",
     "@hono/node-server": "^1.19.9",
     "@openai/codex": "0.144.0",
+    "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/api-logs": "^0.208.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.208.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.208.0",
     "@opentelemetry/resources": "^2.0.0",
     "@opentelemetry/sdk-logs": "^0.208.0",
+    "@opentelemetry/sdk-trace-base": "^2.8.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "@types/jsonwebtoken": "^9.0.10",
     "commander": "^14.0.2",

packages/agent/src/adapters/claude/session/jsonl-hydration.test.ts

@@ -1595,6 +1595,37 @@ describe("hydrateSessionJsonl", () => {
     };
   }
 
+  it("returns the selected conversation when hydrating from logs", async () => {
+    const posthogAPI = {
+      getTaskRun: vi.fn().mockResolvedValue({ log_url: "https://logs.test" }),
+      fetchTaskRunLogs: vi.fn().mockResolvedValue([
+        entry("user_message", {
+          content: { type: "text", text: "previous request" },
+        }),
+      ]),
+    } as unknown as PostHogAPIClient;
+    const log = { info: vi.fn(), warn: vi.fn() };
+
+    const result = await hydrateSessionJsonl({
+      sessionId,
+      cwd,
+      taskId: "t1",
+      runId: "r1",
+      posthogAPI,
+      log,
+    });
+
+    expect(result).toEqual({
+      hasSession: true,
+      conversation: [
+        {
+          role: "user",
+          content: [{ type: "text", text: "previous request" }],
+        },
+      ],
+    });
+  });
+
   it("sanitizes an existing file and skips S3 hydration", async () => {
     const file = await writeSessionFile();
     const { posthogAPI, log } = makeDeps();
@@ -1608,7 +1639,7 @@ describe("hydrateSessionJsonl", () => {
       log,
     });
 
-    expect(result).toBe(true);
+    expect(result).toEqual({ hasSession: true });
     expect(
       (posthogAPI as unknown as { getTaskRun: ReturnType<typeof vi.fn> })
         .getTaskRun,
@@ -1635,7 +1666,7 @@ describe("hydrateSessionJsonl", () => {
       log,
     });
 
-    expect(result).toBe(true);
+    expect(result).toEqual({ hasSession: true });
     expect(log.warn).toHaveBeenCalledWith(
       "Failed to sanitize existing session JSONL",
       expect.anything(),

packages/agent/src/adapters/claude/session/jsonl-hydration.ts

@@ -10,12 +10,17 @@ import { isEmptyContentBlock } from "../../../utils/acp-content";
 import { neutralizeUnprocessableImages } from "../image-sanitization";
 import { supports1MContext } from "./models";
 
-interface ConversationTurn {
+export interface ConversationTurn {
   role: "user" | "assistant";
   content: ContentBlock[];
   toolCalls?: ToolCallInfo[];
 }
 
+export interface HydrateSessionJsonlResult {
+  hasSession: boolean;
+  conversation?: ConversationTurn[];
+}
+
 interface ToolCallInfo {
   toolCallId: string;
   toolName: string;
@@ -681,7 +686,7 @@ export async function hydrateSessionJsonl(params: {
   permissionMode?: string;
   posthogAPI: PostHogAPIClient;
   log: HydrationLog;
-}): Promise<boolean> {
+}): Promise<HydrateSessionJsonlResult> {
   const { posthogAPI, log } = params;
 
   try {
@@ -702,21 +707,21 @@ export async function hydrateSessionJsonl(params: {
           error: err instanceof Error ? err.message : String(err),
         });
       }
-      return true;
+      return { hasSession: true };
     } catch {
       // File doesn't exist, proceed with hydration
     }
 
     const taskRun = await posthogAPI.getTaskRun(params.taskId, params.runId);
     if (!taskRun.log_url) {
       log.info("No log URL, skipping JSONL hydration");
-      return false;
+      return { hasSession: false };
     }
 
     const entries = await posthogAPI.fetchTaskRunLogs(taskRun);
     if (entries.length === 0) {
       log.info("No S3 log entries, skipping JSONL hydration");
-      return false;
+      return { hasSession: false };
     }
 
     const entryCounts: Record<string, number> = {};
@@ -742,7 +747,7 @@ export async function hydrateSessionJsonl(params: {
 
     if (allTurns.length === 0) {
       log.info("No conversation to hydrate, skipping JSONL hydration");
-      return false;
+      return { hasSession: false };
     }
 
     const maxTokens = supports1MContext(params.model ?? "")
@@ -774,12 +779,12 @@ export async function hydrateSessionJsonl(params: {
       turns: conversation.length,
       lines: jsonlLines.length,
     });
-    return true;
+    return { hasSession: true, conversation };
   } catch (err) {
     log.warn("Failed to hydrate session JSONL, continuing", {
       sessionId: params.sessionId,
       error: err instanceof Error ? err.message : String(err),
     });
-    return false;
+    return { hasSession: false };
   }
 }

packages/agent/src/adapters/claude/session/models.test.ts

@@ -30,6 +30,10 @@ describe("toSdkModelId", () => {
     expect(toSdkModelId("claude-sonnet-5")).toBe("claude-sonnet-5");
   });
 
+  it("passes claude-opus-5 through unchanged (no SDK alias)", () => {
+    expect(toSdkModelId("claude-opus-5")).toBe("claude-opus-5");
+  });
+
   it("passes deprecated gateway IDs through unchanged", () => {
     expect(toSdkModelId("claude-opus-4-6")).toBe("claude-opus-4-6");
     expect(toSdkModelId("claude-sonnet-4-5")).toBe("claude-sonnet-4-5");
@@ -67,6 +71,13 @@ describe("model capability flags", () => {
       xhighEffort: true,
       mcpInjection: true,
     },
+    {
+      modelId: "claude-opus-5",
+      oneMContext: true,
+      effort: true,
+      xhighEffort: true,
+      mcpInjection: true,
+    },
     {
       modelId: "claude-sonnet-4-6",
       oneMContext: true,
@@ -123,6 +134,7 @@ describe("resolveEffortForModel", () => {
     ["claude-fable-5", undefined, "high"],
     ["claude-opus-4-8", undefined, "high"],
     ["claude-opus-4-7", undefined, "high"],
+    ["claude-opus-5", undefined, "high"],
     ["claude-sonnet-4-6", undefined, "high"],
     ["claude-sonnet-5", undefined, "high"],
     ["@cf/zai-org/glm-5.2", undefined, "high"],

packages/agent/src/adapters/claude/session/models.ts

@@ -24,6 +24,7 @@ export function toSdkModelId(modelId: string): string {
 const MODELS_WITH_1M_CONTEXT = new Set([
   "claude-opus-4-7",
   "claude-opus-4-8",
+  "claude-opus-5",
   "claude-sonnet-4-6",
   "claude-sonnet-5",
   "claude-fable-5",
@@ -46,6 +47,7 @@ const EXTENDED_EFFORT_LEVELS: readonly EffortLevel[] = [
 const MODEL_EFFORT_LEVELS: Readonly<Record<string, readonly EffortLevel[]>> = {
   "claude-opus-4-7": EXTENDED_EFFORT_LEVELS,
   "claude-opus-4-8": EXTENDED_EFFORT_LEVELS,
+  "claude-opus-5": EXTENDED_EFFORT_LEVELS,
   "claude-sonnet-4-6": STANDARD_EFFORT_LEVELS,
   "claude-sonnet-5": EXTENDED_EFFORT_LEVELS,
   "claude-fable-5": EXTENDED_EFFORT_LEVELS,

packages/agent/src/adapters/error-classification.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it } from "vitest";
-import { classifyAgentError } from "./error-classification";
+import {
+  classifyAgentError,
+  isPromptTooLongError,
+} from "./error-classification";
 
 describe("classifyAgentError", () => {
   it.each([
@@ -22,6 +25,8 @@ describe("classifyAgentError", () => {
     ["API Error: 429 rate limited", "upstream_provider_failure"],
     ["API Error: 529 overloaded", "upstream_provider_failure"],
     ["API Error: 400 invalid request", "agent_error"],
+    // 413 is a hard client rejection, never a transient upstream failure.
+    ["API Error: 413 Payload Too Large", "agent_error"],
     [
       "Connection closed mid-response without the API Error prefix",
       "agent_error",
@@ -32,3 +37,40 @@ describe("classifyAgentError", () => {
     expect(classifyAgentError(message)).toBe(expected);
   });
 });
+
+describe("isPromptTooLongError", () => {
+  it.each([
+    [
+      'API Error: 400 {"type":"error","error":{"type":"invalid_request_error","message":"prompt is too long: 214431 tokens > 204698 maximum"}}',
+      true,
+    ],
+    [
+      'API Error: 413 {"error":{"message":"litellm.ContextWindowExceededError: The estimated number of input and maximum output tokens (262334) exceeded this model context window limit (262144)","code":"5021"}}',
+      true,
+    ],
+    // Must match without the "API Error: 413" prefix.
+    [
+      "litellm.ContextWindowExceededError: The estimated number of input and maximum output tokens (262334) exceeded this model context window limit (262144)",
+      true,
+    ],
+    // The ACP-wrapped shape the agent-server catch actually sees.
+    [
+      'Internal error: API Error: 413 {"error":{"message":"exceeded this model context window limit (262144)"}}',
+      true,
+    ],
+    // Any gateway 413 means an oversized payload, whatever the body text.
+    ["API Error: 413 Payload Too Large", true],
+    // Pins the 413 matcher's i flag.
+    ["api error: 413 payload too large", true],
+    ["API Error: 429 rate limited", false],
+    ["API Error: 400 invalid request", false],
+    ["some unrelated failure", false],
+  ] as const)("detects %j as %s", (message, expected) => {
+    expect(isPromptTooLongError(new Error(message))).toBe(expected);
+  });
+
+  it("handles non-Error inputs", () => {
+    expect(isPromptTooLongError({ message: "prompt is too long" })).toBe(true);
+    expect(isPromptTooLongError(undefined)).toBe(false);
+  });
+});