@rallycry/conveyor-agent 2.18.0 → 3.1.0

package/dist/index.d.ts

@@ -1,26 +1,9 @@
 import { SDKUserMessage } from '@anthropic-ai/claude-agent-sdk';
+import * as _project_shared from '@project/shared';
+import { AgentRunnerStatus, MultimodalBlock, ChatMessageResponse, TaskFileResponse, TaskContext, AgentEvent, AgentQuestion, IncomingMessagePayload, SetModePayload, PmSubMode, SubtaskCreatePayload, SubtaskUpdateFields, SubtaskResponse, TaskLookupResponse } from '@project/shared';
+export { AgentEvent, ChatMessage, TaskContext, TaskFileContext } from '@project/shared';
 import { ChildProcess } from 'node:child_process';
 
-type AgentSettingsThinking = {
-    type: "adaptive";
-} | {
-    type: "enabled";
-    budgetTokens: number;
-} | {
-    type: "disabled";
-};
-type SdkBeta = "context-1m-2025-08-07";
-interface AgentSettings {
-    effort?: "low" | "medium" | "high" | "max";
-    thinking?: AgentSettingsThinking;
-    betas?: SdkBeta[];
-    maxBudgetUsd?: number;
-    maxTurns?: number;
-    disallowedTools?: string[];
-    enableFileCheckpointing?: boolean;
-    settingSources?: ("user" | "project" | "local")[];
-}
-type RunnerMode = "task" | "pm";
 interface AgentRunnerConfig {
     conveyorApiUrl: string;
     taskToken: string;
@@ -28,155 +11,12 @@ interface AgentRunnerConfig {
     model: string;
     instructions: string;
     workspaceDir: string;
-    mode?: RunnerMode;
-    agentSettings?: AgentSettings;
-}
-interface TaskFileContext {
-    fileId: string;
-    fileName: string;
-    mimeType: string;
-    fileSize?: number;
-    downloadUrl: string;
-    content?: string;
-    contentEncoding?: "base64" | "utf-8";
-}
-interface TaskRepoRefContext {
-    path: string;
-    refType: "file" | "folder";
-}
-interface TaskContext {
-    taskId: string;
-    projectId: string;
-    title: string;
-    description: string | null;
-    plan: string | null;
-    status?: string;
-    chatHistory: ChatMessage[];
-    agentId: string | null;
-    agentInstructions: string;
-    model: string;
-    githubBranch: string;
-    baseBranch: string;
-    githubPRUrl?: string | null;
-    claudeSessionId?: string | null;
-    isParentTask?: boolean;
-    useWorktree?: boolean;
-    agentSettings?: AgentSettings | null;
-    storyPoints?: {
-        id: string;
-        value: number;
-        name: string;
-        description: string | null;
-    }[];
-    projectAgents?: {
-        id: string;
-        role: string | null;
-        storyPoints: number | null;
-        agent: {
-            id: string;
-            name: string;
-            image: string | null;
-        };
-    }[];
-    files?: TaskFileContext[];
-    repoRefs?: TaskRepoRefContext[];
-    _runnerSessionId?: string;
+    mode?: _project_shared.RunnerMode;
+    agentSettings?: _project_shared.AgentSettings;
 }
-interface ChatMessageFile {
-    fileId: string;
-    fileName: string;
-    mimeType: string;
-    fileSize?: number;
-    downloadUrl: string;
-    content?: string;
-    contentEncoding?: "base64" | "utf-8";
-}
-interface ChatMessage {
-    role: "user" | "assistant" | "system";
-    content: string;
-    userId?: string;
-    userName?: string;
-    createdAt: string;
-    files?: ChatMessageFile[];
-}
-type MultimodalBlock = {
-    type: "text";
-    text: string;
-} | {
-    type: "image";
-    source: {
-        type: "base64";
-        media_type: "image/gif" | "image/jpeg" | "image/png" | "image/webp";
-        data: string;
-    };
-};
-type AgentEvent = {
-    type: "connected";
-    taskId: string;
-} | {
-    type: "heartbeat";
-    taskId: string;
-} | {
-    type: "thinking";
-    message: string;
-} | {
-    type: "tool_use";
-    tool: string;
-    input: string;
-} | {
-    type: "tool_result";
-    tool: string;
-    output: string;
-    isError?: boolean;
-} | {
-    type: "message";
-    content: string;
-} | {
-    type: "error";
-    message: string;
-} | {
-    type: "completed";
-    summary: string;
-    costUsd?: number;
-    durationMs?: number;
-} | {
-    type: "pr_created";
-    url: string;
-    number: number;
-} | {
-    type: "turn_start";
-} | {
-    type: "turn_end";
-    toolCalls: ActivityEventSummary[];
-} | {
-    type: "setup_output";
-    stream: "stdout" | "stderr";
-    data: string;
-} | {
-    type: "setup_complete";
-    previewPort?: number;
-} | {
-    type: "setup_error";
-    message: string;
-} | {
-    type: "start_command_output";
-    stream: "stdout" | "stderr";
-    data: string;
-} | {
-    type: "agent_typing_start";
-} | {
-    type: "agent_typing_stop";
-};
-interface ActivityEventSummary {
-    tool: string;
-    input?: string;
-    output?: string;
-    timestamp: string;
-}
-type AgentRunnerStatus = "connecting" | "connected" | "setup" | "fetching_context" | "running" | "idle" | "waiting_for_input" | "stopping" | "finished" | "disconnected" | "error";
 interface AgentRunnerCallbacks {
-    onEvent: (event: AgentEvent) => void | Promise<void>;
-    onStatusChange: (status: AgentRunnerStatus) => void | Promise<void>;
+    onEvent: (event: _project_shared.AgentEvent) => void | Promise<void>;
+    onStatusChange: (status: _project_shared.AgentRunnerStatus) => void | Promise<void>;
 }
 
 declare class AgentRunner {
@@ -190,9 +30,10 @@ declare class AgentRunner {
     private setupLog;
     private heartbeatTimer;
     private taskContext;
-    private planFileSnapshot;
-    private lockedPlanFile;
+    private planSync;
+    private costTracker;
     private worktreeActive;
+    private activeMode;
     private static readonly MAX_SETUP_LOG_LINES;
     constructor(config: AgentRunnerConfig, callbacks: AgentRunnerCallbacks);
     get state(): AgentRunnerStatus;
@@ -200,37 +41,41 @@ declare class AgentRunner {
     private startHeartbeat;
     private stopHeartbeat;
     start(): Promise<void>;
+    private runQuerySafe;
     private runCoreLoop;
     private runSetupSafe;
+    private logEffectiveSettings;
     private pushSetupLog;
     private executeSetupConfig;
-    private initRtk;
     private injectHumanMessage;
     private waitForMessage;
     private waitForUserContent;
     createInputStream(initialPrompt: string | MultimodalBlock[]): AsyncGenerator<SDKUserMessage, void, unknown>;
-    private getPlanDirs;
-    /**
-     * Snapshot current plan files so syncPlanFile can distinguish files created
-     * by THIS session from ones created by a concurrent agent.
-     */
-    snapshotPlanFiles(): void;
-    syncPlanFile(): void;
     private asQueryHost;
+    private handleModeChange;
     stop(): void;
 }
 
-interface AgentQuestionOption {
-    label: string;
-    description: string;
-    preview?: string;
+interface ProjectRunnerConfig {
+    conveyorApiUrl: string;
+    projectToken: string;
+    projectId: string;
+    projectDir: string;
 }
-interface AgentQuestion {
-    question: string;
-    header: string;
-    options: AgentQuestionOption[];
-    multiSelect?: boolean;
+declare class ProjectRunner {
+    private connection;
+    private projectDir;
+    private activeAgents;
+    private heartbeatTimer;
+    private stopping;
+    private resolveLifecycle;
+    constructor(config: ProjectRunnerConfig);
+    start(): Promise<void>;
+    private handleAssignment;
+    private handleStopTask;
+    stop(): Promise<void>;
 }
+
 declare class ConveyorConnection {
     private socket;
     private config;
@@ -239,36 +84,16 @@ declare class ConveyorConnection {
     private static readonly EVENT_BATCH_MS;
     private earlyMessages;
     private earlyStop;
+    private earlyModeChanges;
     private chatMessageCallback;
     private stopCallback;
+    private modeChangeCallback;
     private pendingQuestionResolvers;
     constructor(config: AgentRunnerConfig);
     connect(): Promise<void>;
-    fetchChatMessages(limit?: number): Promise<{
-        role: string;
-        content: string;
-        userId: string | null;
-        userName?: string;
-        createdAt: string;
-    }[]>;
-    fetchTaskFiles(): Promise<{
-        fileId: string;
-        fileName: string;
-        mimeType: string;
-        fileSize: number;
-        downloadUrl: string;
-        content?: string;
-        contentEncoding?: "base64" | "utf-8";
-    }[]>;
-    fetchTaskFile(fileId: string): Promise<{
-        fileId: string;
-        fileName: string;
-        mimeType: string;
-        fileSize: number;
-        downloadUrl: string;
-        content?: string;
-        contentEncoding?: "base64" | "utf-8";
-    }>;
+    fetchChatMessages(limit?: number): Promise<ChatMessageResponse[]>;
+    fetchTaskFiles(): Promise<TaskFileResponse[]>;
+    fetchTaskFile(fileId: string): Promise<TaskFileResponse>;
     fetchTaskContext(): Promise<TaskContext>;
     sendEvent(event: AgentEvent): void;
     flushEvents(): void;
@@ -289,87 +114,38 @@ declare class ConveyorConnection {
         plan?: string;
         description?: string;
     }): void;
-    onChatMessage(callback: (message: {
-        content: string;
-        userId: string;
-        files?: {
-            id: string;
-            fileName: string;
-            mimeType: string;
-            downloadUrl: string;
-            content?: string;
-            contentEncoding?: "base64" | "utf-8";
-        }[];
-    }) => void): void;
+    onChatMessage(callback: (message: IncomingMessagePayload) => void): void;
     onStopRequested(callback: () => void): void;
+    onModeChange(callback: (data: SetModePayload) => void): void;
+    emitModeChanged(mode: PmSubMode): void;
     trackSpending(params: {
         agentId: string;
         sessionId: string;
         totalCostUsd: number;
         onSubscription: boolean;
+        modelUsage?: {
+            model: string;
+            inputTokens: number;
+            outputTokens: number;
+            cacheReadInputTokens: number;
+            cacheCreationInputTokens: number;
+            costUSD: number;
+        }[];
     }): void;
     emitStatus(status: string): void;
     sendHeartbeat(): void;
     sendTypingStart(): void;
     sendTypingStop(): void;
-    createSubtask(data: {
-        title: string;
-        description?: string;
-        plan?: string;
-        ordinal?: number;
-        storyPointValue?: number;
-    }): Promise<{
+    createSubtask(data: SubtaskCreatePayload): Promise<{
         id: string;
     }>;
-    updateSubtask(subtaskId: string, fields: {
-        title?: string;
-        description?: string;
-        plan?: string;
-        ordinal?: number;
-        storyPointValue?: number;
-    }): void;
+    updateSubtask(subtaskId: string, fields: SubtaskUpdateFields): void;
     deleteSubtask(subtaskId: string): void;
-    listSubtasks(): Promise<{
-        id: string;
-        title: string;
-        description: string | null;
-        status: string;
-        ordinal: number;
-        storyPointId: string | null;
-        plan: string | null;
-    }[]>;
-    fetchTask(slugOrId: string): Promise<{
-        id: string;
-        slug: string;
-        title: string;
-        description: string | null;
-        plan: string | null;
-        status: string;
-        parentTaskId: string | null;
-    }>;
+    listSubtasks(): Promise<SubtaskResponse[]>;
+    fetchTask(slugOrId: string): Promise<TaskLookupResponse>;
     disconnect(): void;
 }
 
-interface ProjectRunnerConfig {
-    conveyorApiUrl: string;
-    projectToken: string;
-    projectId: string;
-    projectDir: string;
-}
-declare class ProjectRunner {
-    private connection;
-    private projectDir;
-    private activeAgents;
-    private heartbeatTimer;
-    private stopping;
-    private resolveLifecycle;
-    constructor(config: ProjectRunnerConfig);
-    start(): Promise<void>;
-    private handleAssignment;
-    private handleStopTask;
-    stop(): Promise<void>;
-}
-
 interface ProjectConnectionConfig {
     apiUrl: string;
     projectToken: string;
@@ -382,6 +158,7 @@ interface TaskAssignment {
     mode: string;
     branch: string;
     devBranch: string;
+    useWorktree?: boolean;
 }
 interface IncomingChatMessage {
     content: string;
@@ -438,10 +215,9 @@ declare class ProjectConnection {
     disconnect(): void;
 }
 
-/**
- * In-memory LRU file cache for agent environments.
- * Caches file content to avoid redundant downloads during a session.
- */
+declare function ensureWorktree(projectDir: string, taskId: string, branch?: string): string;
+declare function removeWorktree(projectDir: string, taskId: string): void;
+
 interface CacheEntry {
     content: Buffer;
     mimeType: string;
@@ -472,29 +248,8 @@ interface ConveyorConfig {
     previewPort?: number;
 }
 declare function loadConveyorConfig(workspaceDir: string): Promise<ConveyorConfig | null>;
-/**
- * Runs a command synchronously (waits for exit). Streams stdout/stderr
- * line-by-line via the onOutput callback.
- */
+
 declare function runSetupCommand(cmd: string, cwd: string, onOutput: (stream: "stdout" | "stderr", data: string) => void): Promise<void>;
-/**
- * Runs a command in the background (does not wait for exit). Returns the
- * ChildProcess so it can be cleaned up on agent shutdown. Streams
- * stdout/stderr via the onOutput callback.
- */
 declare function runStartCommand(cmd: string, cwd: string, onOutput: (stream: "stdout" | "stderr", data: string) => void): ChildProcess;
 
-/**
- * Ensure a git worktree exists for the given task. Creates one if it doesn't
- * exist, reuses the existing one otherwise. Returns the absolute worktree path.
- *
- * Uses --detach to avoid "branch already checked out" errors when the branch
- * (e.g. dev) is already checked out in the main worktree or another worktree.
- */
-declare function ensureWorktree(projectDir: string, taskId: string, branch?: string): string;
-/**
- * Remove a task's git worktree. Best-effort — silently ignores failures.
- */
-declare function removeWorktree(projectDir: string, taskId: string): void;
-
-export { type AgentContext, type AgentEvent, AgentRunner, type AgentRunnerCallbacks, type AgentRunnerConfig, type ChatHistoryMessage, type ChatMessage, type ConveyorConfig, ConveyorConnection, FileCache, type IncomingChatMessage, ProjectConnection, type ProjectConnectionConfig, ProjectRunner, type ProjectRunnerConfig, type TaskAssignment, type TaskContext, type TaskFileContext, ensureWorktree, loadConveyorConfig, removeWorktree, runSetupCommand, runStartCommand };
+export { type AgentContext, AgentRunner, type AgentRunnerCallbacks, type AgentRunnerConfig, type ChatHistoryMessage, type ConveyorConfig, ConveyorConnection, FileCache, type IncomingChatMessage, ProjectConnection, type ProjectConnectionConfig, ProjectRunner, type ProjectRunnerConfig, type TaskAssignment, ensureWorktree, loadConveyorConfig, removeWorktree, runSetupCommand, runStartCommand };

package/dist/index.js

@@ -1,6 +1,7 @@
 import {
   AgentRunner,
   ConveyorConnection,
+  FileCache,
   ProjectConnection,
   ProjectRunner,
   ensureWorktree,
@@ -8,71 +9,7 @@ import {
   removeWorktree,
   runSetupCommand,
   runStartCommand
-} from "./chunk-I7ETGLPA.js";
-
-// src/file-cache.ts
-var DEFAULT_MAX_SIZE_BYTES = 50 * 1024 * 1024;
-var DEFAULT_TTL_MS = 60 * 60 * 1e3;
-var FileCache = class {
-  cache = /* @__PURE__ */ new Map();
-  currentSize = 0;
-  maxSizeBytes;
-  ttlMs;
-  constructor(maxSizeBytes = DEFAULT_MAX_SIZE_BYTES, ttlMs = DEFAULT_TTL_MS) {
-    this.maxSizeBytes = maxSizeBytes;
-    this.ttlMs = ttlMs;
-  }
-  get(fileId) {
-    const entry = this.cache.get(fileId);
-    if (!entry) return null;
-    if (Date.now() - entry.createdAt > this.ttlMs) {
-      this.delete(fileId);
-      return null;
-    }
-    this.cache.delete(fileId);
-    this.cache.set(fileId, entry);
-    return entry;
-  }
-  set(fileId, content, mimeType, fileName) {
-    if (this.cache.has(fileId)) {
-      this.delete(fileId);
-    }
-    const size = content.byteLength;
-    if (size > this.maxSizeBytes) return;
-    while (this.currentSize + size > this.maxSizeBytes && this.cache.size > 0) {
-      const oldestKey = this.cache.keys().next().value;
-      if (oldestKey !== void 0) {
-        this.delete(oldestKey);
-      }
-    }
-    this.cache.set(fileId, {
-      content,
-      mimeType,
-      fileName,
-      createdAt: Date.now(),
-      size
-    });
-    this.currentSize += size;
-  }
-  delete(fileId) {
-    const entry = this.cache.get(fileId);
-    if (entry) {
-      this.currentSize -= entry.size;
-      this.cache.delete(fileId);
-    }
-  }
-  clear() {
-    this.cache.clear();
-    this.currentSize = 0;
-  }
-  get stats() {
-    return {
-      entries: this.cache.size,
-      sizeBytes: this.currentSize,
-      maxSizeBytes: this.maxSizeBytes
-    };
-  }
-};
+} from "./chunk-22ME6AB3.js";
 export {
   AgentRunner,
   ConveyorConnection,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/file-cache.ts"],"sourcesContent":["/**\n * In-memory LRU file cache for agent environments.\n * Caches file content to avoid redundant downloads during a session.\n */\n\nconst DEFAULT_MAX_SIZE_BYTES = 50 * 1024 * 1024; // 50MB\nconst DEFAULT_TTL_MS = 60 * 60 * 1000; // 1 hour\n\ninterface CacheEntry {\n  content: Buffer;\n  mimeType: string;\n  fileName: string;\n  createdAt: number;\n  size: number;\n}\n\nexport class FileCache {\n  private cache = new Map<string, CacheEntry>();\n  private currentSize = 0;\n  private readonly maxSizeBytes: number;\n  private readonly ttlMs: number;\n\n  constructor(maxSizeBytes = DEFAULT_MAX_SIZE_BYTES, ttlMs = DEFAULT_TTL_MS) {\n    this.maxSizeBytes = maxSizeBytes;\n    this.ttlMs = ttlMs;\n  }\n\n  get(fileId: string): CacheEntry | null {\n    const entry = this.cache.get(fileId);\n    if (!entry) return null;\n\n    if (Date.now() - entry.createdAt > this.ttlMs) {\n      this.delete(fileId);\n      return null;\n    }\n\n    // Move to end (most recently accessed) for LRU\n    this.cache.delete(fileId);\n    this.cache.set(fileId, entry);\n    return entry;\n  }\n\n  set(fileId: string, content: Buffer, mimeType: string, fileName: string): void {\n    // Remove existing entry if present\n    if (this.cache.has(fileId)) {\n      this.delete(fileId);\n    }\n\n    const size = content.byteLength;\n\n    // Don't cache if single file exceeds max\n    if (size > this.maxSizeBytes) return;\n\n    // Evict oldest entries until we have space\n    while (this.currentSize + size > this.maxSizeBytes && this.cache.size > 0) {\n      const oldestKey = this.cache.keys().next().value;\n      if (oldestKey !== undefined) {\n        this.delete(oldestKey);\n      }\n    }\n\n    this.cache.set(fileId, {\n      content,\n      mimeType,\n      fileName,\n      createdAt: Date.now(),\n      size,\n    });\n    this.currentSize += size;\n  }\n\n  private delete(fileId: string): void {\n    const entry = this.cache.get(fileId);\n    if (entry) {\n      this.currentSize -= entry.size;\n      this.cache.delete(fileId);\n    }\n  }\n\n  clear(): void {\n    this.cache.clear();\n    this.currentSize = 0;\n  }\n\n  get stats(): { entries: number; sizeBytes: number; maxSizeBytes: number } {\n    return {\n      entries: this.cache.size,\n      sizeBytes: this.currentSize,\n      maxSizeBytes: this.maxSizeBytes,\n    };\n  }\n}\n"],"mappings":";;;;;;;;;;;;;AAKA,IAAM,yBAAyB,KAAK,OAAO;AAC3C,IAAM,iBAAiB,KAAK,KAAK;AAU1B,IAAM,YAAN,MAAgB;AAAA,EACb,QAAQ,oBAAI,IAAwB;AAAA,EACpC,cAAc;AAAA,EACL;AAAA,EACA;AAAA,EAEjB,YAAY,eAAe,wBAAwB,QAAQ,gBAAgB;AACzE,SAAK,eAAe;AACpB,SAAK,QAAQ;AAAA,EACf;AAAA,EAEA,IAAI,QAAmC;AACrC,UAAM,QAAQ,KAAK,MAAM,IAAI,MAAM;AACnC,QAAI,CAAC,MAAO,QAAO;AAEnB,QAAI,KAAK,IAAI,IAAI,MAAM,YAAY,KAAK,OAAO;AAC7C,WAAK,OAAO,MAAM;AAClB,aAAO;AAAA,IACT;AAGA,SAAK,MAAM,OAAO,MAAM;AACxB,SAAK,MAAM,IAAI,QAAQ,KAAK;AAC5B,WAAO;AAAA,EACT;AAAA,EAEA,IAAI,QAAgB,SAAiB,UAAkB,UAAwB;AAE7E,QAAI,KAAK,MAAM,IAAI,MAAM,GAAG;AAC1B,WAAK,OAAO,MAAM;AAAA,IACpB;AAEA,UAAM,OAAO,QAAQ;AAGrB,QAAI,OAAO,KAAK,aAAc;AAG9B,WAAO,KAAK,cAAc,OAAO,KAAK,gBAAgB,KAAK,MAAM,OAAO,GAAG;AACzE,YAAM,YAAY,KAAK,MAAM,KAAK,EAAE,KAAK,EAAE;AAC3C,UAAI,cAAc,QAAW;AAC3B,aAAK,OAAO,SAAS;AAAA,MACvB;AAAA,IACF;AAEA,SAAK,MAAM,IAAI,QAAQ;AAAA,MACrB;AAAA,MACA;AAAA,MACA;AAAA,MACA,WAAW,KAAK,IAAI;AAAA,MACpB;AAAA,IACF,CAAC;AACD,SAAK,eAAe;AAAA,EACtB;AAAA,EAEQ,OAAO,QAAsB;AACnC,UAAM,QAAQ,KAAK,MAAM,IAAI,MAAM;AACnC,QAAI,OAAO;AACT,WAAK,eAAe,MAAM;AAC1B,WAAK,MAAM,OAAO,MAAM;AAAA,IAC1B;AAAA,EACF;AAAA,EAEA,QAAc;AACZ,SAAK,MAAM,MAAM;AACjB,SAAK,cAAc;AAAA,EACrB;AAAA,EAEA,IAAI,QAAsE;AACxE,WAAO;AAAA,MACL,SAAS,KAAK,MAAM;AAAA,MACpB,WAAW,KAAK;AAAA,MAChB,cAAc,KAAK;AAAA,IACrB;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rallycry/conveyor-agent",
-  "version": "2.18.0",
+  "version": "3.1.0",
   "description": "Conveyor cloud build agent runner - executes task plans inside GitHub Codespaces",
   "keywords": [
     "agent",
@@ -39,6 +39,7 @@
     "zod": "^3.25.76"
   },
   "devDependencies": {
+    "@project/shared": "workspace:*",
     "tsup": "^8.0.0",
     "typescript": "^5.3.0",
     "vitest": "^4.0.17"