@rallycry/conveyor-agent 7.0.1 → 7.0.3

package/dist/chunk-CYZPFJGN.js

@@ -0,0 +1,26 @@
+// src/utils/logger.ts
+function createServiceLogger(service) {
+  const prefix = `[conveyor-agent:${service}]`;
+  return {
+    info(message, data) {
+      const extra = data ? ` ${JSON.stringify(data)}` : "";
+      process.stderr.write(`${prefix} ${message}${extra}
+`);
+    },
+    warn(message, data) {
+      const extra = data ? ` ${JSON.stringify(data)}` : "";
+      process.stderr.write(`${prefix} WARN ${message}${extra}
+`);
+    },
+    error(message, data) {
+      const extra = data ? ` ${JSON.stringify(data)}` : "";
+      process.stderr.write(`${prefix} ERROR ${message}${extra}
+`);
+    }
+  };
+}
+
+export {
+  createServiceLogger
+};
+//# sourceMappingURL=chunk-CYZPFJGN.js.map

package/dist/chunk-CYZPFJGN.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils/logger.ts"],"sourcesContent":["/** Minimal structured logger for conveyor-agent (writes to stderr). */\nexport function createServiceLogger(service: string) {\n  const prefix = `[conveyor-agent:${service}]`;\n  return {\n    info(message: string, data?: Record<string, unknown>): void {\n      const extra = data ? ` ${JSON.stringify(data)}` : \"\";\n      process.stderr.write(`${prefix} ${message}${extra}\\n`);\n    },\n    warn(message: string, data?: Record<string, unknown>): void {\n      const extra = data ? ` ${JSON.stringify(data)}` : \"\";\n      process.stderr.write(`${prefix} WARN ${message}${extra}\\n`);\n    },\n    error(message: string, data?: Record<string, unknown>): void {\n      const extra = data ? ` ${JSON.stringify(data)}` : \"\";\n      process.stderr.write(`${prefix} ERROR ${message}${extra}\\n`);\n    },\n  };\n}\n"],"mappings":";AACO,SAAS,oBAAoB,SAAiB;AACnD,QAAM,SAAS,mBAAmB,OAAO;AACzC,SAAO;AAAA,IACL,KAAK,SAAiB,MAAsC;AAC1D,YAAM,QAAQ,OAAO,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK;AAClD,cAAQ,OAAO,MAAM,GAAG,MAAM,IAAI,OAAO,GAAG,KAAK;AAAA,CAAI;AAAA,IACvD;AAAA,IACA,KAAK,SAAiB,MAAsC;AAC1D,YAAM,QAAQ,OAAO,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK;AAClD,cAAQ,OAAO,MAAM,GAAG,MAAM,SAAS,OAAO,GAAG,KAAK;AAAA,CAAI;AAAA,IAC5D;AAAA,IACA,MAAM,SAAiB,MAAsC;AAC3D,YAAM,QAAQ,OAAO,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK;AAClD,cAAQ,OAAO,MAAM,GAAG,MAAM,UAAU,OAAO,GAAG,KAAK;AAAA,CAAI;AAAA,IAC7D;AAAA,EACF;AACF;","names":[]}

package/dist/chunk-KNBG2634.js

@@ -0,0 +1,51 @@
+// src/harness/types.ts
+function defineTool(name, description, schema, handler, options) {
+  return {
+    name,
+    description,
+    schema,
+    handler,
+    annotations: options?.annotations
+  };
+}
+
+// src/harness/claude-code/index.ts
+import { query, tool, createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
+var ClaudeCodeHarness = class {
+  async *executeQuery(opts) {
+    const sdkEvents = query({
+      prompt: opts.prompt,
+      options: {
+        ...opts.options,
+        ...opts.resume ? { resume: opts.resume } : {},
+        ...opts.options.abortController ? { abortController: opts.options.abortController } : {}
+      }
+    });
+    for await (const event of sdkEvents) {
+      yield event;
+    }
+  }
+  createMcpServer(config) {
+    const sdkTools = config.tools.map(
+      (t) => tool(
+        t.name,
+        t.description,
+        t.schema,
+        t.handler,
+        t.annotations ? { annotations: t.annotations } : void 0
+      )
+    );
+    return createSdkMcpServer({ name: config.name, tools: sdkTools });
+  }
+};
+
+// src/harness/index.ts
+function createHarness() {
+  return new ClaudeCodeHarness();
+}
+
+export {
+  defineTool,
+  createHarness
+};
+//# sourceMappingURL=chunk-KNBG2634.js.map

package/dist/chunk-KNBG2634.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/harness/types.ts","../src/harness/claude-code/index.ts","../src/harness/index.ts"],"sourcesContent":["/**\n * Harness-neutral types for agent query execution.\n *\n * These types abstract the underlying agent SDK so that the runner,\n * execution, and tool layers never reference SDK-specific imports\n * directly.  The only place that should import from\n * `@anthropic-ai/claude-agent-sdk` is `harness/claude-code/`.\n */\n\nimport type { z } from \"zod\";\n\n// ── Events emitted by the harness during a query ────────────────────────\n\nexport interface HarnessSystemInitEvent {\n  type: \"system\";\n  subtype: \"init\";\n  session_id?: string;\n  model: string;\n}\n\nexport interface HarnessCompactBoundaryEvent {\n  type: \"system\";\n  subtype: \"compact_boundary\";\n  compact_metadata: { trigger: \"manual\" | \"auto\"; pre_tokens: number };\n}\n\nexport interface HarnessTaskStartedEvent {\n  type: \"system\";\n  subtype: \"task_started\";\n  task_id: string;\n  description: string;\n}\n\nexport interface HarnessTaskProgressEvent {\n  type: \"system\";\n  subtype: \"task_progress\";\n  task_id: string;\n  description: string;\n  usage?: { tool_uses: number; duration_ms: number };\n}\n\nexport type HarnessSystemEvent =\n  | HarnessSystemInitEvent\n  | HarnessCompactBoundaryEvent\n  | HarnessTaskStartedEvent\n  | HarnessTaskProgressEvent;\n\nexport interface HarnessContentBlock {\n  type: string;\n  text?: string;\n  name?: string;\n  input?: unknown;\n  id?: string;\n}\n\nexport interface HarnessAssistantEvent {\n  type: \"assistant\";\n  message: {\n    role: \"assistant\";\n    content: HarnessContentBlock[];\n    usage?: {\n      input_tokens?: number;\n      cache_read_input_tokens?: number;\n      cache_creation_input_tokens?: number;\n    };\n  };\n}\n\nexport interface HarnessResultSuccessEvent {\n  type: \"result\";\n  subtype: \"success\";\n  result: string;\n  total_cost_usd: number;\n  modelUsage?: Record<string, unknown>;\n  sessionId?: string;\n}\n\nexport interface HarnessResultErrorEvent {\n  type: \"result\";\n  subtype: \"error\";\n  errors: string[];\n  sessionId?: string;\n}\n\nexport type HarnessResultEvent = HarnessResultSuccessEvent | HarnessResultErrorEvent;\n\nexport interface HarnessRateLimitEvent {\n  type: \"rate_limit_event\";\n  rate_limit_info: {\n    status: string;\n    rateLimitType?: string;\n    utilization?: number;\n    resetsAt?: unknown;\n  };\n}\n\nexport interface HarnessToolProgressEvent {\n  type: \"tool_progress\";\n  tool_name?: string;\n  elapsed_time_seconds?: number;\n}\n\nexport type HarnessEvent =\n  | HarnessSystemEvent\n  | HarnessAssistantEvent\n  | HarnessResultEvent\n  | HarnessRateLimitEvent\n  | HarnessToolProgressEvent;\n\n// ── User message fed into a query ───────────────────────────────────────\n\nexport interface HarnessUserMessage {\n  type: \"user\";\n  session_id: string;\n  message: { role: \"user\"; content: string | unknown[] };\n  parent_tool_use_id: null;\n}\n\n// ── Tool definition (harness-neutral) ───────────────────────────────────\n\nexport interface HarnessToolAnnotations {\n  readOnlyHint?: boolean;\n}\n\n/* eslint-disable @typescript-eslint/no-explicit-any -- generic tool handler */\nexport interface HarnessToolDefinition {\n  name: string;\n  description: string;\n  schema: z.ZodRawShape;\n  handler: (\n    input: any,\n  ) => Promise<{ content: { type: string; text?: string; data?: string; mimeType?: string }[] }>;\n  annotations?: HarnessToolAnnotations;\n}\n/* eslint-enable @typescript-eslint/no-explicit-any */\n\n// ── Hook types ──────────────────────────────────────────────────────────\n\nexport interface HarnessHookInput {\n  hook_event_name: string;\n  tool_name: string;\n  tool_response: unknown;\n}\n\nexport interface HarnessHookOutput {\n  continue: boolean;\n}\n\nexport type HarnessPostToolUseHook = (input: HarnessHookInput) => Promise<HarnessHookOutput>;\n\n// ── MCP server handle (opaque to the runner) ────────────────────────────\n\n/** Opaque handle returned by `AgentHarness.createMcpServer()`. */\nexport type HarnessMcpServer = unknown;\n\n// ── Query options ───────────────────────────────────────────────────────\n\nexport interface HarnessQueryOptions {\n  model: string;\n  systemPrompt: unknown;\n  cwd: string;\n  permissionMode: \"plan\" | \"bypassPermissions\";\n  allowDangerouslySkipPermissions: boolean;\n  tools: { type: \"preset\"; preset: \"claude_code\" };\n  mcpServers: Record<string, HarnessMcpServer>;\n  settingSources?: (\"user\" | \"project\" | \"local\")[];\n  sandbox?: { enabled: boolean };\n  maxTurns?: number;\n  maxBudgetUsd?: number;\n  effort?: string;\n  thinking?: unknown;\n  betas?: unknown;\n  disallowedTools?: string[];\n  abortController?: AbortController;\n  enableFileCheckpointing?: boolean;\n  canUseTool?: (\n    toolName: string,\n    input: Record<string, unknown>,\n  ) => Promise<\n    | { behavior: \"allow\"; updatedInput?: Record<string, unknown> }\n    | { behavior: \"deny\"; message: string }\n  >;\n  hooks?: Record<string, { hooks: HarnessPostToolUseHook[]; timeout: number }[]>;\n  resume?: string;\n  stderr?: (data: string) => void;\n}\n\n// ── Tool definition helper ──────────────────────────────────────────────\n\n/**\n * Construct a `HarnessToolDefinition` with the same signature as the SDK's\n * `tool()` helper, but without importing the SDK.  The harness implementation\n * converts these into SDK-native tools when `createMcpServer()` is called.\n */\nexport function defineTool<T extends z.ZodRawShape>(\n  name: string,\n  description: string,\n  schema: T,\n  handler: (\n    input: z.infer<z.ZodObject<T>>,\n  ) => Promise<{ content: { type: string; text?: string; data?: string; mimeType?: string }[] }>,\n  options?: { annotations?: HarnessToolAnnotations },\n): HarnessToolDefinition {\n  return {\n    name,\n    description,\n    schema,\n    handler: handler as HarnessToolDefinition[\"handler\"],\n    annotations: options?.annotations,\n  };\n}\n\n// ── AgentHarness interface ──────────────────────────────────────────────\n\nexport interface AgentHarness {\n  /** Start a streaming query and return an async generator of events. */\n  executeQuery(options: {\n    prompt: string | AsyncGenerator<HarnessUserMessage, void, unknown>;\n    options: HarnessQueryOptions;\n    resume?: string;\n  }): AsyncGenerator<HarnessEvent, void>;\n\n  /** Wrap an array of harness-neutral tool definitions into an MCP server. */\n  createMcpServer(config: { name: string; tools: HarnessToolDefinition[] }): HarnessMcpServer;\n}\n","/**\n * ClaudeCodeHarness — wraps `@anthropic-ai/claude-agent-sdk` behind the\n * generic `AgentHarness` interface.\n *\n * This is the ONLY module that should import from the SDK.\n */\n\nimport { query, tool, createSdkMcpServer } from \"@anthropic-ai/claude-agent-sdk\";\nimport type {\n  AgentHarness,\n  HarnessEvent,\n  HarnessQueryOptions,\n  HarnessToolDefinition,\n  HarnessMcpServer,\n  HarnessUserMessage,\n} from \"../types.js\";\n\nexport class ClaudeCodeHarness implements AgentHarness {\n  async *executeQuery(opts: {\n    prompt: string | AsyncGenerator<HarnessUserMessage, void, unknown>;\n    options: HarnessQueryOptions;\n    resume?: string;\n  }): AsyncGenerator<HarnessEvent, void> {\n    const sdkEvents = query({\n      prompt: opts.prompt as Parameters<typeof query>[0][\"prompt\"],\n      options: {\n        ...(opts.options as Parameters<typeof query>[0][\"options\"]),\n        ...(opts.resume ? { resume: opts.resume } : {}),\n        ...(opts.options.abortController ? { abortController: opts.options.abortController } : {}),\n      },\n    });\n\n    for await (const event of sdkEvents) {\n      yield event as unknown as HarnessEvent;\n    }\n  }\n\n  createMcpServer(config: { name: string; tools: HarnessToolDefinition[] }): HarnessMcpServer {\n    const sdkTools = config.tools.map((t) =>\n      tool(\n        t.name,\n        t.description,\n        t.schema,\n        t.handler as Parameters<typeof tool>[3],\n        t.annotations ? { annotations: t.annotations } : undefined,\n      ),\n    );\n    return createSdkMcpServer({ name: config.name, tools: sdkTools });\n  }\n}\n","export { defineTool } from \"./types.js\";\n\nexport type {\n  AgentHarness,\n  HarnessEvent,\n  HarnessSystemEvent,\n  HarnessSystemInitEvent,\n  HarnessCompactBoundaryEvent,\n  HarnessTaskStartedEvent,\n  HarnessTaskProgressEvent,\n  HarnessAssistantEvent,\n  HarnessContentBlock,\n  HarnessResultEvent,\n  HarnessResultSuccessEvent,\n  HarnessResultErrorEvent,\n  HarnessRateLimitEvent,\n  HarnessToolProgressEvent,\n  HarnessUserMessage,\n  HarnessToolDefinition,\n  HarnessToolAnnotations,\n  HarnessMcpServer,\n  HarnessQueryOptions,\n  HarnessHookInput,\n  HarnessHookOutput,\n  HarnessPostToolUseHook,\n} from \"./types.js\";\n\nexport { ClaudeCodeHarness } from \"./claude-code/index.js\";\n\nimport { ClaudeCodeHarness } from \"./claude-code/index.js\";\nimport type { AgentHarness } from \"./types.js\";\n\nexport function createHarness(): AgentHarness {\n  return new ClaudeCodeHarness();\n}\n"],"mappings":";AAkMO,SAAS,WACd,MACA,aACA,QACA,SAGA,SACuB;AACvB,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,aAAa,SAAS;AAAA,EACxB;AACF;;;AC3MA,SAAS,OAAO,MAAM,0BAA0B;AAUzC,IAAM,oBAAN,MAAgD;AAAA,EACrD,OAAO,aAAa,MAImB;AACrC,UAAM,YAAY,MAAM;AAAA,MACtB,QAAQ,KAAK;AAAA,MACb,SAAS;AAAA,QACP,GAAI,KAAK;AAAA,QACT,GAAI,KAAK,SAAS,EAAE,QAAQ,KAAK,OAAO,IAAI,CAAC;AAAA,QAC7C,GAAI,KAAK,QAAQ,kBAAkB,EAAE,iBAAiB,KAAK,QAAQ,gBAAgB,IAAI,CAAC;AAAA,MAC1F;AAAA,IACF,CAAC;AAED,qBAAiB,SAAS,WAAW;AACnC,YAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,gBAAgB,QAA4E;AAC1F,UAAM,WAAW,OAAO,MAAM;AAAA,MAAI,CAAC,MACjC;AAAA,QACE,EAAE;AAAA,QACF,EAAE;AAAA,QACF,EAAE;AAAA,QACF,EAAE;AAAA,QACF,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,IAAI;AAAA,MACnD;AAAA,IACF;AACA,WAAO,mBAAmB,EAAE,MAAM,OAAO,MAAM,OAAO,SAAS,CAAC;AAAA,EAClE;AACF;;;ACjBO,SAAS,gBAA8B;AAC5C,SAAO,IAAI,kBAAkB;AAC/B;","names":[]}

package/dist/{chunk-HAU4E7IA.js → chunk-L7ZH423N.js}

@@ -1,3 +1,11 @@
+import {
+  createHarness,
+  defineTool
+} from "./chunk-KNBG2634.js";
+import {
+  createServiceLogger
+} from "./chunk-CYZPFJGN.js";
+
 // src/connection/agent-connection.ts
 import { io } from "socket.io-client";
 var EVENT_BATCH_MS = 500;
@@ -133,15 +141,7 @@ var AgentConnection = class {
       });
       this.socket.io.on("reconnect", () => {
         process.stderr.write("[conveyor-agent] Reconnected\n");
-        void this.call("connectAgent", { sessionId: this.config.sessionId }).catch(() => {
-        });
-        if (this.lastEmittedStatus) {
-          void this.call("reportAgentStatus", {
-            sessionId: this.config.sessionId,
-            status: this.lastEmittedStatus
-          }).catch(() => {
-          });
-        }
+        void this.reconnectToSession();
       });
       this.socket.io.on("reconnect_attempt", () => {
       });
@@ -156,6 +156,53 @@ var AgentConnection = class {
       this.socket = null;
     }
   }
+  // ── Reconnect with retry ────────────────────────────────────────────
+  async reconnectToSession() {
+    const maxRetries = 5;
+    const baseDelayMs = 2e3;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+      try {
+        const { pendingMessages } = await this.call("connectAgent", {
+          sessionId: this.config.sessionId
+        });
+        this.drainPendingMessages(pendingMessages);
+        process.stderr.write("[conveyor-agent] Reconnected to session successfully\n");
+        if (this.lastEmittedStatus) {
+          void this.call("reportAgentStatus", {
+            sessionId: this.config.sessionId,
+            status: this.lastEmittedStatus
+          }).catch(() => {
+          });
+        }
+        return;
+      } catch (err) {
+        const errMsg = err instanceof Error ? err.message : String(err);
+        const delayMs = baseDelayMs * 2 ** (attempt - 1);
+        process.stderr.write(
+          `[conveyor-agent] connectAgent failed (attempt ${attempt}/${maxRetries}): ${errMsg} \u2014 retrying in ${delayMs / 1e3}s
+`
+        );
+        await new Promise((resolve2) => {
+          setTimeout(resolve2, delayMs);
+        });
+      }
+    }
+    process.stderr.write(
+      `[conveyor-agent] Failed to reconnect to session after ${maxRetries} attempts, exiting
+`
+    );
+    process.exit(1);
+  }
+  drainPendingMessages(messages) {
+    for (const msg of messages) {
+      if (!msg.content) continue;
+      if (this.messageCallback) {
+        this.messageCallback({ content: msg.content, userId: msg.userId });
+      } else {
+        this.earlyMessages.push({ content: msg.content, userId: msg.userId });
+      }
+    }
+  }
   // ── Callback registration with early-buffer draining ───────────────
   onMessage(callback) {
     this.messageCallback = callback;
@@ -543,28 +590,6 @@ var Lifecycle = class {
   }
 };
 
-// src/utils/logger.ts
-function createServiceLogger(service) {
-  const prefix = `[conveyor-agent:${service}]`;
-  return {
-    info(message, data) {
-      const extra = data ? ` ${JSON.stringify(data)}` : "";
-      process.stderr.write(`${prefix} ${message}${extra}
-`);
-    },
-    warn(message, data) {
-      const extra = data ? ` ${JSON.stringify(data)}` : "";
-      process.stderr.write(`${prefix} WARN ${message}${extra}
-`);
-    },
-    error(message, data) {
-      const extra = data ? ` ${JSON.stringify(data)}` : "";
-      process.stderr.write(`${prefix} ERROR ${message}${extra}
-`);
-    }
-  };
-}
-
 // src/runner/git-utils.ts
 import { execSync } from "child_process";
 function hasUncommittedChanges(cwd) {
@@ -772,52 +797,6 @@ var PlanSync = class {
   }
 };
 
-// src/harness/types.ts
-function defineTool(name, description, schema, handler, options) {
-  return {
-    name,
-    description,
-    schema,
-    handler,
-    annotations: options?.annotations
-  };
-}
-
-// src/harness/claude-code/index.ts
-import { query, tool, createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
-var ClaudeCodeHarness = class {
-  async *executeQuery(opts) {
-    const sdkEvents = query({
-      prompt: opts.prompt,
-      options: {
-        ...opts.options,
-        ...opts.resume ? { resume: opts.resume } : {},
-        ...opts.options.abortController ? { abortController: opts.options.abortController } : {}
-      }
-    });
-    for await (const event of sdkEvents) {
-      yield event;
-    }
-  }
-  createMcpServer(config) {
-    const sdkTools = config.tools.map(
-      (t) => tool(
-        t.name,
-        t.description,
-        t.schema,
-        t.handler,
-        t.annotations ? { annotations: t.annotations } : void 0
-      )
-    );
-    return createSdkMcpServer({ name: config.name, tools: sdkTools });
-  }
-};
-
-// src/harness/index.ts
-function createHarness() {
-  return new ClaudeCodeHarness();
-}
-
 // src/execution/pack-runner-prompt.ts
 function findLastAgentMessageIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
@@ -1209,8 +1188,7 @@ function buildAutoPrompt(context) {
     `You are in Auto mode \u2014 operating autonomously through planning \u2192 building \u2192 PR.`,
     ``,
     `### Phase 1: Discovery & Planning (current)`,
-    `- You have read-only codebase access (can read files, run git commands, search code)`,
-    `- You can write plan files in .claude/plans/ only \u2014 no other file writes`,
+    `- You are in the SDK's plan mode \u2014 read-only access is enforced automatically`,
     `- You have MCP tools for task properties: update_task, update_task_properties`,
     ``,
     `### Required before transitioning:`,
@@ -2334,7 +2312,16 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
           }
         }
         if (hasUnpushedCommits(cwd)) {
-          const pushSuccess = await pushToOrigin(cwd);
+          const pushSuccess = await pushToOrigin(cwd, async () => {
+            try {
+              const result2 = await connection.call("refreshGithubToken", {
+                sessionId: connection.sessionId
+              });
+              return result2.token;
+            } catch {
+              return void 0;
+            }
+          });
           if (pushSuccess) {
             connection.sendEvent({
               type: "message",
@@ -2347,6 +2334,7 @@ Co-Authored-By: Claude Sonnet 4 <noreply@anthropic.com>`;
           }
         }
         const result = await connection.call("createPullRequest", {
+          sessionId: connection.sessionId,
           title,
           body,
           head: branch,
@@ -4696,18 +4684,12 @@ function handleAutoToolAccess(toolName, input, hasExitedPlanMode, isParentTask)
   if (hasExitedPlanMode) {
     return isParentTask ? handleReviewToolAccess(toolName, input, true) : handleBuildingToolAccess(toolName, input);
   }
-  if (PM_PLAN_FILE_TOOLS.has(toolName)) {
-    if (isPlanFile(input)) {
-      return { behavior: "allow", updatedInput: input };
-    }
-    return {
-      behavior: "deny",
-      message: "You are in auto plan mode. File writes are restricted to plan files. Call ExitPlanMode when your plan is ready to start building."
-    };
-  }
   return { behavior: "allow", updatedInput: input };
 }
 async function handleExitPlanMode(host, input) {
+  if (host.hasExitedPlanMode) {
+    return { behavior: "allow", updatedInput: input };
+  }
   try {
     host.syncPlanFile();
     const taskProps = await host.connection.getTaskProperties();
@@ -5274,6 +5256,8 @@ var QueryBridge = class {
       const msg = err instanceof Error ? err.message : String(err);
       logger2.error("Query execution failed", { error: msg });
       this.connection.sendEvent({ type: "error", message: msg });
+    } finally {
+      this.mode.pendingModeRestart = false;
     }
   }
   // ── QueryHost construction ──────────────────────────────────────────
@@ -5343,6 +5327,7 @@ var SessionRunner = class _SessionRunner {
   callbacks;
   _state = "connecting";
   stopped = false;
+  hasCompleted = false;
   interrupted = false;
   taskContext = null;
   fullContext = null;
@@ -5354,7 +5339,7 @@ var SessionRunner = class _SessionRunner {
     this.config = config;
     this.callbacks = callbacks;
     this.connection = new AgentConnection(config.connection);
-    const initialMode = config.agentMode ?? (config.runnerMode === "pm" ? "discovery" : "building");
+    const initialMode = config.agentMode ?? (config.runnerMode === "pm" ? config.isAuto ? "auto" : "discovery" : "building");
     this.mode = new ModeController(initialMode, config.runnerMode, config.isAuto);
     const lifecycleConfig = { ...DEFAULT_LIFECYCLE_CONFIG, ...config.lifecycle };
     this.lifecycle = new Lifecycle(lifecycleConfig, {
@@ -5430,6 +5415,9 @@ var SessionRunner = class _SessionRunner {
     this.queryBridge = this.createQueryBridge();
     this.logInitialization();
     await this.executeInitialMode();
+    if (!this.stopped && this._state !== "error") {
+      this.hasCompleted = true;
+    }
     if (!this.stopped && this.pendingMessages.length === 0) {
       await this.maybeSendPRNudge();
     }
@@ -5459,6 +5447,12 @@ var SessionRunner = class _SessionRunner {
           }
           break;
         }
+        if (this.hasCompleted && msg.userId === "system") {
+          continue;
+        }
+        if (msg.userId !== "system") {
+          this.hasCompleted = false;
+        }
         await this.setState("running");
         this.interrupted = false;
         await this.callbacks.onEvent({
@@ -5472,6 +5466,7 @@ var SessionRunner = class _SessionRunner {
         if (!this.stopped && this.pendingMessages.length === 0) {
           await this.maybeSendPRNudge();
         }
+        this.hasCompleted = true;
         if (!this.stopped) await this.setState("idle");
       } else if (this._state === "error") {
         await this.setState("idle");
@@ -5634,7 +5629,12 @@ var SessionRunner = class _SessionRunner {
       baseBranch: ctx.baseBranch ?? "",
       githubPRUrl: ctx.githubPRUrl,
       claudeSessionId: ctx.claudeSessionId ?? null,
-      isParentTask: !!ctx.parentTaskId
+      isParentTask: !!ctx.parentTaskId,
+      storyPoints: ctx.storyPoints ?? void 0,
+      projectAgents: ctx.projectAgents ?? void 0,
+      projectTags: ctx.projectTags ?? void 0,
+      taskTagIds: ctx.taskTagIds ?? void 0,
+      projectObjectives: ctx.projectObjectives ?? void 0
     };
   }
   createQueryBridge() {
@@ -5833,6 +5833,9 @@ var ProjectConnection = class {
   onRestartStartCommand(callback) {
     this.requireSocket().on("projectRunner:restartStartCommand", callback);
   }
+  onAuditTags(callback) {
+    this.requireSocket().on("projectRunner:auditTags", callback);
+  }
   // ── Outgoing helpers ───────────────────────────────────────────────────
   sendHeartbeat() {
     void this.call("projectRunnerHeartbeat", { projectId: this.config.projectId }).catch(() => {
@@ -6342,21 +6345,24 @@ function buildChatQueryOptions(agentCtx, projectDir, connection) {
     tools: buildProjectTools(connection)
   });
   return {
-    model,
-    systemPrompt: {
-      type: "preset",
-      preset: "claude_code",
-      append: buildSystemPrompt2(projectDir, agentCtx)
+    options: {
+      model,
+      systemPrompt: {
+        type: "preset",
+        preset: "claude_code",
+        append: buildSystemPrompt2(projectDir, agentCtx)
+      },
+      cwd: projectDir,
+      permissionMode: "bypassPermissions",
+      allowDangerouslySkipPermissions: true,
+      tools: { type: "preset", preset: "claude_code" },
+      mcpServers: { conveyor: mcpServer },
+      maxTurns: settings.maxTurns ?? 30,
+      maxBudgetUsd: settings.maxBudgetUsd ?? 50,
+      effort: settings.effort,
+      thinking: settings.thinking
     },
-    cwd: projectDir,
-    permissionMode: "bypassPermissions",
-    allowDangerouslySkipPermissions: true,
-    tools: { type: "preset", preset: "claude_code" },
-    mcpServers: { conveyor: mcpServer },
-    maxTurns: settings.maxTurns ?? 30,
-    maxBudgetUsd: settings.maxBudgetUsd ?? 50,
-    effort: settings.effort,
-    thinking: settings.thinking
+    harness
   };
 }
 function processContentBlock(block, responseParts, turnToolCalls) {
@@ -6405,10 +6411,9 @@ function emitResultCost(event, connection) {
 }
 async function runChatQuery(message, connection, projectDir, sessionId) {
   const { agentCtx, chatHistory } = await fetchContext(connection, message.chatId);
-  const options = buildChatQueryOptions(agentCtx, projectDir, connection);
+  const { options, harness } = buildChatQueryOptions(agentCtx, projectDir, connection);
   const prompt = buildPrompt(message, chatHistory);
   connection.emitStatus("busy");
-  const harness = createHarness();
   const events = harness.executeQuery({
     prompt,
     options,
@@ -6433,7 +6438,8 @@ async function runChatQuery(message, connection, projectDir, sessionId) {
   if (responseText) {
     await connection.call("postProjectAgentMessage", {
       projectId: connection.projectId,
-      content: responseText
+      content: responseText,
+      chatId: message.chatId
     });
   }
   return resultSessionId;
@@ -6448,7 +6454,8 @@ async function handleProjectChatMessage(message, connection, projectDir, session
     try {
       await connection.call("postProjectAgentMessage", {
         projectId: connection.projectId,
-        content: "I encountered an error processing your message. Please try again."
+        content: "I encountered an error processing your message. Please try again.",
+        chatId: message.chatId
       });
     } catch {
     }
@@ -6580,7 +6587,7 @@ var ProjectRunner = class {
     await this.connection.connect();
     const registration = await this.connection.call("registerProjectAgent", {
       projectId: this.connection.projectId,
-      capabilities: ["task", "pm", "code-review"]
+      capabilities: ["task", "pm", "code-review", "audit"]
     });
     this.branchSwitchCommand = registration.branchSwitchCommand ?? process.env.CONVEYOR_BRANCH_SWITCH_COMMAND;
     logger6.info("Registered as project agent", { agentName: registration.agentName });
@@ -6653,7 +6660,7 @@ var ProjectRunner = class {
   }
   // ── Event wiring ───────────────────────────────────────────────────────
   wireEventHandlers() {
-    this.connection.onTaskAssignment((assignment) => this.handleAssignment(assignment));
+    this.connection.onTaskAssignment((assignment) => void this.handleAssignment(assignment));
     this.connection.onStopTask((data) => this.handleStopTask(data.taskId));
     this.connection.onShutdown(() => void this.stop());
     this.connection.onChatMessage((msg) => {
@@ -6665,6 +6672,7 @@ var ProjectRunner = class {
         }
       );
     });
+    this.connection.onAuditTags((request) => void this.handleAuditTags(request));
     this.connection.onSwitchBranch((data, cb) => void this.handleSwitchBranch(data, cb));
     this.connection.onSyncEnvironment((cb) => void this.handleSyncEnvironment(cb));
     this.connection.onRestartStartCommand((cb) => {
@@ -6677,7 +6685,7 @@ var ProjectRunner = class {
     try {
       await this.connection.call("registerProjectAgent", {
         projectId: this.connection.projectId,
-        capabilities: ["task", "pm", "code-review"]
+        capabilities: ["task", "pm", "code-review", "audit"]
       });
       this.connection.emitStatus(this.activeAgents.size > 0 ? "busy" : "idle");
       logger6.info("Re-registered after reconnect");
@@ -6686,14 +6694,66 @@ var ProjectRunner = class {
       logger6.error("Failed to re-register after reconnect", { error: msg });
     }
   }
+  // ── Tag audit ──────────────────────────────────────────────────────────
+  async handleAuditTags(request) {
+    this.connection.emitStatus("busy");
+    try {
+      const { handleTagAudit } = await import("./tag-audit-handler-4RRGIHVB.js");
+      await handleTagAudit(request, this.connection, this.projectDir);
+    } catch (error) {
+      const msg = error instanceof Error ? error.message : String(error);
+      logger6.error("Tag audit failed", { error: msg, requestId: request.requestId });
+      try {
+        await this.connection.call("reportTagAuditResult", {
+          projectId: this.connection.projectId,
+          requestId: request.requestId,
+          recommendations: [],
+          summary: `Audit failed: ${msg}`,
+          complete: true
+        });
+      } catch {
+      }
+    } finally {
+      this.connection.emitStatus("idle");
+    }
+  }
   // ── Task management ────────────────────────────────────────────────────
-  handleAssignment(assignment) {
+  async killAgent(agent, taskId) {
+    const shortId = taskId.slice(0, 8);
+    if (agent.process.exitCode !== null) {
+      logger6.info("Agent process already exited", { taskId: shortId });
+      return;
+    }
+    logger6.info("Killing agent process", { taskId: shortId });
+    agent.process.kill("SIGTERM");
+    await new Promise((resolve2) => {
+      const timer = setTimeout(() => {
+        if (agent.process.exitCode === null) {
+          logger6.warn("Agent did not exit after SIGTERM, sending SIGKILL", { taskId: shortId });
+          agent.process.kill("SIGKILL");
+        }
+        resolve2();
+      }, STOP_TIMEOUT_MS);
+      agent.process.on("exit", () => {
+        clearTimeout(timer);
+        resolve2();
+      });
+    });
+  }
+  // oxlint-disable-next-line max-lines-per-function -- re-assignment logic requires sequential checks
+  async handleAssignment(assignment) {
     const { taskId, mode } = assignment;
     const shortId = taskId.slice(0, 8);
     const agentKey = assignment.agentMode === "code-review" ? `${taskId}:code-review` : taskId;
-    if (this.activeAgents.has(agentKey)) {
-      logger6.info("Task already running, skipping", { taskId: shortId });
-      return;
+    const existing = this.activeAgents.get(agentKey);
+    if (existing) {
+      if (existing.process.exitCode === null) {
+        logger6.info("Re-assignment received, killing existing agent", { taskId: shortId });
+        await this.killAgent(existing, taskId);
+      } else {
+        logger6.info("Stale agent entry (process already exited), cleaning up", { taskId: shortId });
+      }
+      this.activeAgents.delete(agentKey);
     }
     if (this.activeAgents.size >= MAX_CONCURRENT) {
       logger6.warn("Max concurrent agents reached", { maxConcurrent: MAX_CONCURRENT });
@@ -6735,16 +6795,11 @@ var ProjectRunner = class {
     }
   }
   handleStopTask(taskId) {
-    let agent = this.activeAgents.get(taskId);
-    if (!agent) agent = this.activeAgents.get(`${taskId}:code-review`);
+    const agentKey = this.activeAgents.has(taskId) ? taskId : `${taskId}:code-review`;
+    const agent = this.activeAgents.get(agentKey);
     if (!agent) return;
     logger6.info("Stopping task", { taskId: taskId.slice(0, 8) });
-    agent.process.kill("SIGTERM");
-    const timer = setTimeout(() => {
-      if (this.activeAgents.has(taskId)) agent.process.kill("SIGKILL");
-    }, STOP_TIMEOUT_MS);
-    agent.process.on("exit", () => {
-      clearTimeout(timer);
+    void this.killAgent(agent, taskId).then(() => {
       if (agent.usesWorktree) {
         try {
           removeWorktree(this.projectDir, taskId);
@@ -7013,7 +7068,6 @@ export {
   ModeController,
   DEFAULT_LIFECYCLE_CONFIG,
   Lifecycle,
-  createServiceLogger,
   hasUncommittedChanges,
   getCurrentBranch,
   hasUnpushedCommits,
@@ -7033,4 +7087,4 @@ export {
   removeWorktree,
   ProjectRunner
 };
-//# sourceMappingURL=chunk-HAU4E7IA.js.map
+//# sourceMappingURL=chunk-L7ZH423N.js.map