@rallycry/conveyor-agent 5.10.3 → 5.11.1

package/dist/{chunk-ASK2L7IU.js → chunk-U3YWTVH3.js}

@@ -427,6 +427,23 @@ var ConveyorConnection = class _ConveyorConnection {
   triggerIdentification() {
     return triggerIdentification(this.socket);
   }
+  async refreshAuthToken() {
+    const codespaceName = process.env.CODESPACE_NAME;
+    const apiUrl = process.env.CONVEYOR_API_URL ?? this.config.conveyorApiUrl;
+    if (!codespaceName || !apiUrl) return false;
+    try {
+      const response = await fetch(`${apiUrl}/api/codespace/bootstrap/${codespaceName}`);
+      if (!response.ok) return false;
+      const config = await response.json();
+      if (config.envVars?.CLAUDE_CODE_OAUTH_TOKEN) {
+        process.env.CLAUDE_CODE_OAUTH_TOKEN = config.envVars.CLAUDE_CODE_OAUTH_TOKEN;
+        return true;
+      }
+      return false;
+    } catch {
+      return false;
+    }
+  }
   emitModeTransition(payload) {
     if (!this.socket) return;
     this.socket.emit("agentRunner:modeTransition", payload);
@@ -572,6 +589,10 @@ var ProjectConnection = class {
     if (!this.socket) return;
     this.socket.emit("conveyor:tagAuditResult", data);
   }
+  emitAuditProgress(data) {
+    if (!this.socket) return;
+    this.socket.emit("conveyor:tagAuditProgress", data);
+  }
   sendHeartbeat() {
     if (!this.socket) return;
     this.socket.emit("projectRunner:heartbeat", {});
@@ -838,6 +859,10 @@ async function processAssistantEvent(event, host, turnToolCalls) {
 }
 var API_ERROR_PATTERN = /API Error: [45]\d\d/;
 var IMAGE_ERROR_PATTERN = /Could not process image/i;
+var AUTH_ERROR_PATTERN = /Not logged in|Please run \/login|authentication failed|invalid.*token|unauthorized/i;
+function isAuthError(msg) {
+  return AUTH_ERROR_PATTERN.test(msg);
+}
 function isRetriableMessage(msg) {
   if (IMAGE_ERROR_PATTERN.test(msg)) return true;
   if (API_ERROR_PATTERN.test(msg)) return true;
@@ -918,6 +943,10 @@ function handleErrorResult(event, host) {
   if (isStaleSession) {
     return { retriable: false, staleSession: true };
   }
+  if (isAuthError(errorMsg)) {
+    host.connection.sendEvent({ type: "error", message: errorMsg });
+    return { retriable: false, authError: true };
+  }
   const retriable = isRetriableMessage(errorMsg);
   host.connection.sendEvent({ type: "error", message: errorMsg });
   return { retriable };
@@ -957,7 +986,8 @@ async function emitResultEvent(event, host, context, startTime, lastAssistantUsa
   return {
     retriable: result.retriable,
     resultSummary: result.resultSummary,
-    staleSession: result.staleSession
+    staleSession: result.staleSession,
+    authError: result.authError
   };
 }
 function handleRateLimitEvent(event, host) {
@@ -1057,6 +1087,7 @@ async function handleResultCase(event, host, context, startTime, isTyping, lastA
     retriable: resultInfo.retriable,
     resultSummary: resultInfo.resultSummary,
     staleSession: resultInfo.staleSession,
+    authError: resultInfo.authError,
     stoppedTyping
   };
 }
@@ -1104,6 +1135,7 @@ async function processResultCase(event, host, context, startTime, state) {
   state.retriable = info.retriable;
   state.resultSummary = info.resultSummary;
   if (info.staleSession) state.staleSession = true;
+  if (info.authError) state.authError = true;
 }
 async function processEvents(events, context, host) {
   const startTime = Date.now();
@@ -1117,6 +1149,7 @@ async function processEvents(events, context, host) {
     resultSummary: void 0,
     rateLimitResetsAt: void 0,
     staleSession: void 0,
+    authError: void 0,
     lastAssistantUsage: void 0,
     turnToolCalls: []
   };
@@ -1156,7 +1189,8 @@ async function processEvents(events, context, host) {
     retriable: state.retriable || state.sawApiError,
     resultSummary: state.resultSummary,
     rateLimitResetsAt: state.rateLimitResetsAt,
-    ...state.staleSession && { staleSession: state.staleSession }
+    ...state.staleSession && { staleSession: state.staleSession },
+    ...state.authError && { authError: state.authError }
   };
 }
 
@@ -2357,11 +2391,14 @@ function buildCreatePullRequestTool(connection) {
     "Create a GitHub pull request for this task. Use this instead of gh CLI or git commands to create PRs.",
     {
       title: z.string().describe("The PR title"),
-      body: z.string().describe("The PR description/body in markdown")
+      body: z.string().describe("The PR description/body in markdown"),
+      branch: z.string().optional().describe(
+        "The head branch name for the PR. If the task doesn't have a branch set, this will be used. Defaults to the task's existing branch."
+      )
     },
-    async ({ title, body }) => {
+    async ({ title, body, branch }) => {
       try {
-        const result = await connection.createPR({ title, body });
+        const result = await connection.createPR({ title, body, branch });
         connection.sendEvent({
           type: "pr_created",
           url: result.url,
@@ -3108,6 +3145,29 @@ async function buildRetryQuery(host, context, options, lastErrorWasImage) {
     options: { ...options, resume: void 0 }
   });
 }
+async function handleAuthError(context, host, options) {
+  host.connection.postChatMessage("Authentication expired. Re-bootstrapping credentials...");
+  const refreshed = await host.connection.refreshAuthToken();
+  if (!refreshed) {
+    host.connection.postChatMessage("Failed to refresh authentication. Agent will restart.");
+    host.connection.sendEvent({
+      type: "error",
+      message: "Auth re-bootstrap failed, exiting for restart"
+    });
+    process.exit(1);
+  }
+  context.claudeSessionId = null;
+  host.connection.storeSessionId("");
+  const freshPrompt = buildMultimodalPrompt(
+    await buildInitialPrompt(host.config.mode, context, host.config.isAuto, host.agentMode),
+    context
+  );
+  const freshQuery = query({
+    prompt: host.createInputStream(freshPrompt),
+    options: { ...options, resume: void 0 }
+  });
+  return runWithRetry(freshQuery, context, host, options);
+}
 async function handleStaleSession(context, host, options) {
   context.claudeSessionId = null;
   host.connection.storeSessionId("");
@@ -3176,26 +3236,41 @@ function handleRetryError(error, context, host, options, prevImageError) {
   if (isStaleOrExitedSession(error, context) && context.claudeSessionId) {
     return handleStaleSession(context, host, options);
   }
+  if (isAuthError(getErrorMessage(error))) {
+    return handleAuthError(context, host, options);
+  }
   if (!isRetriableError(error)) throw error;
   return { action: "continue", lastErrorWasImage: classifyImageError(error) || prevImageError };
 }
+function handleProcessResult(result, context, host, options) {
+  if (result.modeRestart || host.isStopped()) return { action: "return" };
+  if (result.rateLimitResetsAt) {
+    handleRateLimitPause(host, result.rateLimitResetsAt);
+    return { action: "return" };
+  }
+  if (result.staleSession && context.claudeSessionId) {
+    return { action: "return_promise", promise: handleStaleSession(context, host, options) };
+  }
+  if (result.authError) {
+    return { action: "return_promise", promise: handleAuthError(context, host, options) };
+  }
+  if (!result.retriable) return { action: "return" };
+  return {
+    action: "continue",
+    lastErrorWasImage: IMAGE_ERROR_PATTERN2.test(result.resultSummary ?? "")
+  };
+}
 async function runWithRetry(initialQuery, context, host, options) {
   let lastErrorWasImage = false;
   for (let attempt = 0; attempt <= RETRY_DELAYS_MS.length; attempt++) {
     if (host.isStopped()) return;
     const agentQuery = attempt === 0 ? initialQuery : await buildRetryQuery(host, context, options, lastErrorWasImage);
     try {
-      const { retriable, resultSummary, modeRestart, rateLimitResetsAt, staleSession } = await processEvents(agentQuery, context, host);
-      if (modeRestart || host.isStopped()) return;
-      if (rateLimitResetsAt) {
-        handleRateLimitPause(host, rateLimitResetsAt);
-        return;
-      }
-      if (staleSession && context.claudeSessionId) {
-        return handleStaleSession(context, host, options);
-      }
-      if (!retriable) return;
-      lastErrorWasImage = IMAGE_ERROR_PATTERN2.test(resultSummary ?? "");
+      const result = await processEvents(agentQuery, context, host);
+      const outcome = handleProcessResult(result, context, host, options);
+      if (outcome.action === "return") return;
+      if (outcome.action === "return_promise") return outcome.promise;
+      lastErrorWasImage = outcome.lastErrorWasImage;
     } catch (error) {
       const outcome = handleRetryError(error, context, host, options, lastErrorWasImage);
       if (outcome instanceof Promise) return outcome;
@@ -4603,6 +4678,23 @@ function buildAuditSystemPrompt(projectName, tags, heatmapData, projectDir) {
     "Analyze actual file contents, not just file names."
   ].join("\n");
 }
+function emitToolCallProgress(event, request, connection) {
+  if (event.type !== "assistant") return;
+  const assistantEvent = event;
+  for (const block of assistantEvent.message.content) {
+    if (block.type === "tool_use" && block.name) {
+      const inputStr = typeof block.input === "string" ? block.input : JSON.stringify(block.input);
+      connection.emitAuditProgress({
+        requestId: request.requestId,
+        activity: {
+          tool: block.name,
+          input: inputStr.slice(0, 500),
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        }
+      });
+    }
+  }
+}
 async function runAuditQuery(request, connection, projectDir) {
   connection.emitAgentStatus("fetching_context");
   let agentCtx = null;
@@ -4650,7 +4742,7 @@ async function runAuditQuery(request, connection, projectDir) {
       allowDangerouslySkipPermissions: true,
       tools: { type: "preset", preset: "claude_code" },
       mcpServers: { "tag-audit": createAuditMcpServer(collector, onRecommendation) },
-      maxTurns: settings.maxTurns ?? 30,
+      maxTurns: settings.maxTurns ?? 75,
       maxBudgetUsd: settings.maxBudgetUsd ?? 5,
       effort: settings.effort,
       thinking: settings.thinking
@@ -4660,6 +4752,7 @@ async function runAuditQuery(request, connection, projectDir) {
   const turnToolCalls = [];
   const isTyping = { value: false };
   for await (const event of events) {
+    emitToolCallProgress(event, request, connection);
     const done = processEventStream(event, connection, responseParts, turnToolCalls, isTyping);
     if (done) break;
   }
@@ -5363,4 +5456,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-ASK2L7IU.js.map
+//# sourceMappingURL=chunk-U3YWTVH3.js.map