@rallycry/conveyor-agent 5.3.0 → 5.4.0

package/dist/{chunk-DMWUXQ4M.js → chunk-DJJBHD4H.js}

@@ -908,8 +908,35 @@ async function processEvents(events, context, host) {
     switch (event.type) {
       case "system": {
         const systemEvent = event;
-        const stored = await handleSystemEvent(systemEvent, host, context, sessionIdStored);
-        if (stored) sessionIdStored = true;
+        if (systemEvent.subtype === "init") {
+          const stored = await handleSystemEvent(systemEvent, host, context, sessionIdStored);
+          if (stored) sessionIdStored = true;
+        } else if (systemEvent.subtype === "compact_boundary") {
+          const meta = systemEvent.compact_metadata;
+          if (meta) {
+            void host.callbacks.onEvent({
+              type: "context_compacted",
+              trigger: meta.trigger,
+              preTokens: meta.pre_tokens
+            });
+          }
+        } else if (systemEvent.subtype === "task_started") {
+          const msg = systemEvent;
+          void host.callbacks.onEvent({
+            type: "subagent_started",
+            sdkTaskId: msg.task_id ?? "",
+            description: msg.description ?? ""
+          });
+        } else if (systemEvent.subtype === "task_progress") {
+          const msg = systemEvent;
+          void host.callbacks.onEvent({
+            type: "subagent_progress",
+            sdkTaskId: msg.task_id ?? "",
+            description: msg.description ?? "",
+            toolUses: msg.usage?.tool_uses ?? 0,
+            durationMs: msg.usage?.duration_ms ?? 0
+          });
+        }
         break;
       }
       case "assistant": {
@@ -949,6 +976,15 @@ async function processEvents(events, context, host) {
         if (resetsAt) rateLimitResetsAt = resetsAt;
         break;
       }
+      case "tool_progress": {
+        const msg = event;
+        void host.callbacks.onEvent({
+          type: "tool_progress",
+          toolName: msg.tool_name ?? "",
+          elapsedSeconds: msg.elapsed_time_seconds ?? 0
+        });
+        break;
+      }
     }
   }
   if (isTyping) {
@@ -2882,7 +2918,6 @@ function pushSetupLog(setupLog, line) {
   }
 }
 async function executeSetupConfig(config, runnerConfig, connection, setupLog) {
-  let deferredStartConfig = null;
   if (config.setupCommand) {
     pushSetupLog(setupLog, `$ ${config.setupCommand}`);
     await runSetupCommand(config.setupCommand, runnerConfig.workspaceDir, (stream, data) => {
@@ -2899,7 +2934,6 @@ async function executeSetupConfig(config, runnerConfig, connection, setupLog) {
       connection.sendEvent({ type: "start_command_output", stream, data });
     });
   }
-  return deferredStartConfig;
 }
 async function checkoutTaskBranch(runnerConfig, connection, callbacks, setupLog) {
   const taskBranch = process.env.CONVEYOR_TASK_BRANCH;
@@ -2946,29 +2980,23 @@ async function runSetupSafe(runnerConfig, connection, callbacks, setupLog, _effe
     );
   }
   if (!await checkoutTaskBranch(runnerConfig, connection, callbacks, setupLog)) {
-    return { ok: false, deferredStartConfig: null };
+    return { ok: false, conveyorConfig: null };
   }
   const config = await loadConveyorConfig(runnerConfig.workspaceDir);
   if (!config) {
     connection.sendEvent({ type: "setup_complete" });
     await callbacks.onEvent({ type: "setup_complete" });
-    return { ok: true, deferredStartConfig: null };
+    return { ok: true, conveyorConfig: null };
   }
   try {
-    const deferredStartConfig = await executeSetupConfig(
-      config,
-      runnerConfig,
-      connection,
-      setupLog
-    );
+    await executeSetupConfig(config, runnerConfig, connection, setupLog);
     const setupEvent = {
       type: "setup_complete",
-      previewPort: config.previewPort ?? void 0,
-      startCommandDeferred: deferredStartConfig === null ? void 0 : true
+      previewPort: config.previewPort ?? void 0
     };
     connection.sendEvent(setupEvent);
     await callbacks.onEvent(setupEvent);
-    return { ok: true, deferredStartConfig };
+    return { ok: true, conveyorConfig: config };
   } catch (error) {
     const message = error instanceof Error ? error.message : "Setup failed";
     connection.sendEvent({ type: "setup_error", message });
@@ -2977,7 +3005,7 @@ async function runSetupSafe(runnerConfig, connection, callbacks, setupLog, _effe
       `Environment setup failed: ${message}
 The agent cannot start until this is resolved.`
     );
-    return { ok: false, deferredStartConfig: null };
+    return { ok: false, conveyorConfig: null };
   }
 }
 function runAuthTokenSafe(config, connection, taskContext) {
@@ -2991,16 +3019,16 @@ function runAuthTokenSafe(config, connection, taskContext) {
   } catch {
   }
 }
-function runDeferredStartCommand(deferredStartConfig, runnerConfig, connection, setupLog) {
-  if (!deferredStartConfig?.startCommand) return;
-  pushSetupLog(setupLog, `$ ${deferredStartConfig.startCommand} &  (background, deferred)`);
+function rerunStartCommand(conveyorConfig, runnerConfig, connection, setupLog) {
+  if (!conveyorConfig.startCommand) return;
+  pushSetupLog(setupLog, `$ ${conveyorConfig.startCommand} &  (background, re-trigger)`);
   connection.sendEvent({ type: "start_command_started" });
-  runStartCommand(deferredStartConfig.startCommand, runnerConfig.workspaceDir, (stream, data) => {
+  runStartCommand(conveyorConfig.startCommand, runnerConfig.workspaceDir, (stream, data) => {
     connection.sendEvent({ type: "start_command_output", stream, data });
   });
   const setupEvent = {
     type: "setup_complete",
-    previewPort: deferredStartConfig.previewPort ?? void 0
+    previewPort: conveyorConfig.previewPort ?? void 0
   };
   connection.sendEvent(setupEvent);
 }
@@ -3143,7 +3171,7 @@ var AgentRunner = class {
   prNudgeCount = 0;
   idleTimer = null;
   idleCheckInterval = null;
-  deferredStartConfig = null;
+  conveyorConfig = null;
   _queryHost = null;
   constructor(config, callbacks) {
     this.config = config;
@@ -3215,7 +3243,7 @@ var AgentRunner = class {
         this.connection.disconnect();
         return;
       }
-      this.deferredStartConfig = result.deferredStartConfig;
+      this.conveyorConfig = result.conveyorConfig;
     }
     this.tryInitWorktree();
     if (!await this.fetchAndInitContext()) return;
@@ -3399,15 +3427,9 @@ var AgentRunner = class {
     }
   }
   handleRunStartCommand() {
-    if (!this.deferredStartConfig?.startCommand || this.startCommandStarted) return;
+    if (!this.conveyorConfig?.startCommand || this.startCommandStarted) return;
     this.startCommandStarted = true;
-    runDeferredStartCommand(
-      this.deferredStartConfig,
-      this.config,
-      this.connection,
-      this.setupLog
-    );
-    this.deferredStartConfig = null;
+    rerunStartCommand(this.conveyorConfig, this.config, this.connection, this.setupLog);
   }
   logEffectiveSettings() {
     if (!this.taskContext) return;
@@ -3440,6 +3462,9 @@ var AgentRunner = class {
       resolve2(msg);
     } else {
       this.pendingMessages.push(msg);
+      if (this._queryHost?.activeQuery) {
+        this.softStop();
+      }
     }
   }
   waitForMessage() {
@@ -4049,4 +4074,4 @@ export {
   ProjectRunner,
   FileCache
 };
-//# sourceMappingURL=chunk-DMWUXQ4M.js.map
+//# sourceMappingURL=chunk-DJJBHD4H.js.map