refactor(agent): generalize native goal naming

Generated-By: PostHog Code
Task-Id: f8939190-58a1-493b-904c-457c7859b3d6

Author: tatoalo

packages/agent/src/acp-extensions.ts

@@ -91,7 +91,7 @@ export const POSTHOG_NOTIFICATIONS = {
   CODEX_GOAL: "_posthog/codex_goal",
 } as const;
 
-export type CodexGoalState = {
+export type NativeGoalState = {
   objective: string;
   status:
     | "active"

packages/agent/src/adapters/codex-app-server/codex-app-server-agent.test.ts

@@ -454,7 +454,7 @@ describe("CodexAppServerAgent", () => {
 
     await agent.newSession({
       cwd: "/repo",
-      _meta: { codexGoal: restoredGoal },
+      _meta: { nativeGoal: restoredGoal },
     } as unknown as NewSessionRequest);
 
     expect(stub.requests).toContainEqual({

packages/agent/src/adapters/codex-app-server/codex-app-server-agent.ts

@@ -21,7 +21,7 @@ import type {
 } from "@agentclientprotocol/sdk";
 import { mcpToolKey, posthogToolMeta } from "@posthog/shared";
 import {
-  type CodexGoalState,
+  type NativeGoalState,
   POSTHOG_NOTIFICATIONS,
 } from "../../acp-extensions";
 import { DEFAULT_CODEX_MODEL } from "../../gateway-models";
@@ -90,7 +90,7 @@ type AppServerSessionMeta = {
   channelMode?: boolean;
   spokenNarration?: boolean;
   baseBranch?: string;
-  codexGoal?: CodexGoalState;
+  nativeGoal?: NativeGoalState;
 };
 
 /** The subset of codex's `Thread` the adapter reads: id + persisted `turns` for history replay. */
@@ -101,7 +101,7 @@ type AppServerThread = {
 
 type ThreadGoal = {
   objective: string;
-  status: CodexGoalState["status"];
+  status: NativeGoalState["status"];
 };
 
 type GoalCommand =
@@ -482,8 +482,8 @@ export class CodexAppServerAgent extends BaseAcpAgent {
     }
     this.threadId = threadId;
     this.sessionId = threadId;
-    if (method === APP_SERVER_METHODS.THREAD_START && params.meta?.codexGoal) {
-      await this.restoreGoal(params.meta.codexGoal);
+    if (method === APP_SERVER_METHODS.THREAD_START && params.meta?.nativeGoal) {
+      await this.restoreGoal(params.meta.nativeGoal);
     }
     await this.loadModelConfig();
     this.emitConfigOptions();
@@ -785,7 +785,7 @@ export class CodexAppServerAgent extends BaseAcpAgent {
     this.broadcastAgentText(`${prefix}: ${result.goal.objective}`);
   }
 
-  private async restoreGoal(goal: CodexGoalState): Promise<void> {
+  private async restoreGoal(goal: NativeGoalState): Promise<void> {
     if (!this.threadId) return;
     const result = await this.rpc.request<{ goal: ThreadGoal }>(
       APP_SERVER_METHODS.THREAD_GOAL_SET,
@@ -798,7 +798,7 @@ export class CodexAppServerAgent extends BaseAcpAgent {
     await this.emitGoalState(result.goal);
   }
 
-  private async emitGoalState(goal: CodexGoalState | null): Promise<void> {
+  private async emitGoalState(goal: NativeGoalState | null): Promise<void> {
     await this.client
       .extNotification(POSTHOG_NOTIFICATIONS.CODEX_GOAL, { goal })
       .catch((error) =>

packages/agent/src/resume.ts

@@ -16,7 +16,7 @@
  */
 
 import type { ContentBlock } from "@agentclientprotocol/sdk";
-import type { CodexGoalState } from "./acp-extensions";
+import type { NativeGoalState } from "./acp-extensions";
 import { selectRecentTurns } from "./adapters/claude/session/jsonl-hydration";
 import type { PostHogAPIClient } from "./posthog-api";
 import { ResumeSaga } from "./sagas/resume-saga";
@@ -30,7 +30,7 @@ export interface ResumeState {
   lastDevice?: DeviceInfo;
   logEntryCount: number;
   sessionId: string | null;
-  codexGoal?: CodexGoalState | null;
+  nativeGoal?: NativeGoalState | null;
 }
 
 export interface ConversationTurn {
@@ -97,7 +97,7 @@ export async function resumeFromLog(
     lastDevice: result.data.lastDevice,
     logEntryCount: result.data.logEntryCount,
     sessionId: result.data.sessionId,
-    codexGoal: result.data.codexGoal,
+    nativeGoal: result.data.nativeGoal,
   };
 }
 

packages/agent/src/sagas/resume-saga.test.ts

@@ -663,7 +663,7 @@ describe("ResumeSaga", () => {
 
       expect(result.success).toBe(true);
       if (!result.success) return;
-      expect(result.data.codexGoal).toEqual(expected);
+      expect(result.data.nativeGoal).toEqual(expected);
     });
   });
 

packages/agent/src/sagas/resume-saga.ts

@@ -1,6 +1,6 @@
 import type { ContentBlock } from "@agentclientprotocol/sdk";
 import { Saga } from "@posthog/shared";
-import { type CodexGoalState, POSTHOG_NOTIFICATIONS } from "../acp-extensions";
+import { type NativeGoalState, POSTHOG_NOTIFICATIONS } from "../acp-extensions";
 import type { PostHogAPIClient } from "../posthog-api";
 import type {
   DeviceInfo,
@@ -37,7 +37,7 @@ export interface ResumeOutput {
   lastDevice?: DeviceInfo;
   logEntryCount: number;
   sessionId: string | null;
-  codexGoal?: CodexGoalState | null;
+  nativeGoal?: NativeGoalState | null;
 }
 
 export class ResumeSaga extends Saga<ResumeInput, ResumeOutput> {
@@ -92,8 +92,8 @@ export class ResumeSaga extends Saga<ResumeInput, ResumeOutput> {
     const sessionId = await this.readOnlyStep("find_session_id", () =>
       Promise.resolve(this.findSessionId(entries)),
     );
-    const codexGoal = await this.readOnlyStep("find_codex_goal", () =>
-      Promise.resolve(this.findCodexGoal(entries)),
+    const nativeGoal = await this.readOnlyStep("find_native_goal", () =>
+      Promise.resolve(this.findNativeGoal(entries)),
     );
 
     this.log.info("Resume state rebuilt", {
@@ -110,7 +110,7 @@ export class ResumeSaga extends Saga<ResumeInput, ResumeOutput> {
       lastDevice,
       logEntryCount: entries.length,
       sessionId,
-      codexGoal,
+      nativeGoal,
     };
   }
 
@@ -121,14 +121,14 @@ export class ResumeSaga extends Saga<ResumeInput, ResumeOutput> {
       interrupted: false,
       logEntryCount: 0,
       sessionId: null,
-      codexGoal: undefined,
+      nativeGoal: undefined,
     };
   }
 
-  private findCodexGoal(
+  private findNativeGoal(
     entries: StoredNotification[],
-  ): CodexGoalState | null | undefined {
-    const statuses = new Set<CodexGoalState["status"]>([
+  ): NativeGoalState | null | undefined {
+    const statuses = new Set<NativeGoalState["status"]>([
       "active",
       "paused",
       "blocked",
@@ -151,11 +151,11 @@ export class ResumeSaga extends Saga<ResumeInput, ResumeOutput> {
       if (
         typeof value.objective === "string" &&
         typeof value.status === "string" &&
-        statuses.has(value.status as CodexGoalState["status"])
+        statuses.has(value.status as NativeGoalState["status"])
       ) {
         return {
           objective: value.objective,
-          status: value.status as CodexGoalState["status"],
+          status: value.status as NativeGoalState["status"],
         };
       }
       return undefined;

packages/agent/src/server/agent-server.test.ts

@@ -243,9 +243,9 @@ interface TestableServer {
     runtimeAdapter: Adapter,
   ): { claudeCode: { options: Record<string, unknown> } } | undefined;
   resumeState: ResumeState | null;
-  getCodexGoalForFreshSession(
+  getNativeGoalForFreshSession(
     runtimeAdapter: Adapter,
-  ): ResumeState["codexGoal"];
+  ): ResumeState["nativeGoal"];
 }
 
 interface NativeResumeTestServer {
@@ -2389,11 +2389,11 @@ describe("AgentServer HTTP Mode", () => {
         interrupted: false,
         logEntryCount: 1,
         sessionId: "prior-session",
-        codexGoal: goal,
+        nativeGoal: goal,
       };
 
-      expect(s.getCodexGoalForFreshSession("codex")).toEqual(goal);
-      expect(s.getCodexGoalForFreshSession("claude")).toBeUndefined();
+      expect(s.getNativeGoalForFreshSession("codex")).toEqual(goal);
+      expect(s.getNativeGoalForFreshSession("claude")).toBeUndefined();
     });
 
     it.each([

packages/agent/src/server/agent-server.ts

@@ -802,11 +802,11 @@ export class AgentServer {
     return { sessionId: priorSessionId, warm };
   }
 
-  private getCodexGoalForFreshSession(
+  private getNativeGoalForFreshSession(
     runtimeAdapter: Adapter,
-  ): ResumeState["codexGoal"] {
+  ): ResumeState["nativeGoal"] {
     if (runtimeAdapter !== "codex") return undefined;
-    return this.resumeState?.codexGoal;
+    return this.resumeState?.nativeGoal;
   }
 
   async stop(): Promise<void> {
@@ -1438,7 +1438,7 @@ export class AgentServer {
       initialPermissionMode,
     );
     let effectiveSessionMeta: typeof sessionMeta & {
-      codexGoal?: NonNullable<ResumeState["codexGoal"]>;
+      nativeGoal?: NonNullable<ResumeState["nativeGoal"]>;
     } = sessionMeta;
 
     let acpSessionId: string | null = null;
@@ -1467,10 +1467,10 @@ export class AgentServer {
       }
     }
     if (!acpSessionId) {
-      const restoredCodexGoal =
-        this.getCodexGoalForFreshSession(runtimeAdapter);
-      effectiveSessionMeta = restoredCodexGoal
-        ? { ...sessionMeta, codexGoal: restoredCodexGoal }
+      const restoredNativeGoal =
+        this.getNativeGoalForFreshSession(runtimeAdapter);
+      effectiveSessionMeta = restoredNativeGoal
+        ? { ...sessionMeta, nativeGoal: restoredNativeGoal }
         : sessionMeta;
       const sessionResponse = await clientConnection.newSession({
         cwd: sessionCwd,