@slopus/rig 0.0.4 → 0.0.6

package/dist/server/InMemorySessionStore.d.ts

@@ -1,7 +1,9 @@
 import type { ChangeEffortRequest, ChangeModelRequest, CreateSessionRequest, ModelCatalog, SessionSummary, SubagentSummary } from "../protocol/index.js";
 import { InMemorySession } from "./InMemorySession.js";
 import type { SessionStore } from "./SessionStore.js";
+import type { McpToolProvider } from "../mcp/index.js";
 export interface InMemorySessionStoreOptions {
+    mcpToolProvider?: McpToolProvider;
     modelCatalog?: ModelCatalog;
 }
 export declare class InMemorySessionStore implements SessionStore {

package/dist/server/InMemorySessionStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InMemorySessionStore.d.ts","sourceRoot":"","sources":["../../sources/server/InMemorySessionStore.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EAEZ,cAAc,EACd,eAAe,EAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,2BAA2B;IACxC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,qBAAa,oBAAqB,YAAW,YAAY;;gBAMzC,OAAO,GAAE,2BAAgC;IAUrD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,eAAe,GAAG,SAAS;IAU1F,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe;IAmBtD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAInD,IAAI,CAAC,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS,cAAc,EAAE;IAQjE,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,eAAe,EAAE;IAOlE,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS;CAS3F"}
+{"version":3,"file":"InMemorySessionStore.d.ts","sourceRoot":"","sources":["../../sources/server/InMemorySessionStore.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EAEZ,cAAc,EACd,eAAe,EAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,MAAM,WAAW,2BAA2B;IACxC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B;AAED,qBAAa,oBAAqB,YAAW,YAAY;;gBAOzC,OAAO,GAAE,2BAAgC;IAiBrD,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,eAAe,GAAG,SAAS;IAU1F,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe;IAsBtD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAInD,IAAI,CAAC,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS,cAAc,EAAE;IAQjE,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,eAAe,EAAE;IAOlE,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS;CAS3F"}

package/dist/server/InMemorySessionStore.js

@@ -6,13 +6,17 @@ export class InMemorySessionStore {
     #agentManager;
     #createEventId = createEventIdFactory();
     #modelCatalog;
+    #mcpToolProvider;
     #sessions = new Map();
     constructor(options = {}) {
         this.#modelCatalog = options.modelCatalog ?? createModelCatalog();
+        this.#mcpToolProvider = options.mcpToolProvider;
         this.#agentManager = new AgentSessionManager({
             repository: {
                 createSubagent: (request, metadata) => this.#createSession(request, metadata),
                 get: (sessionId) => this.get(sessionId),
+                listByRoot: (rootSessionId) => [...this.#sessions.values()].filter((session) => session.agentMetadata().rootSessionId === rootSessionId &&
+                    session.isSubagent()),
             },
         });
     }
@@ -32,6 +36,9 @@ export class InMemorySessionStore {
             agentManager: this.#agentManager,
             createEventId: this.#createEventId,
             modelCatalog: this.#modelCatalog,
+            ...(this.#mcpToolProvider !== undefined
+                ? { mcpToolProvider: this.#mcpToolProvider }
+                : {}),
             ...(metadata !== undefined ? { metadata } : {}),
             request,
         });

package/dist/server/PersistentSessionStore.d.ts

@@ -1,8 +1,10 @@
 import type { ChangeEffortRequest, ChangeModelRequest, CreateSessionRequest, ModelCatalog, SessionInterruption, SessionSummary, SubagentSummary } from "../protocol/index.js";
 import { InMemorySession, type InMemorySessionPersistence, type PersistedQueuedRun, type PersistedSessionMessage, type PersistedSessionState } from "./InMemorySession.js";
 import type { SessionStore } from "./SessionStore.js";
+import type { McpToolProvider } from "../mcp/index.js";
 export interface PersistentSessionStoreOptions {
     databasePath: string;
+    mcpToolProvider?: McpToolProvider;
     modelCatalog?: ModelCatalog;
     now?: () => number;
 }

package/dist/server/PersistentSessionStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PersistentSessionStore.d.ts","sourceRoot":"","sources":["../../sources/server/PersistentSessionStore.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACR,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EAGZ,mBAAmB,EACnB,cAAc,EACd,eAAe,EAElB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EACH,eAAe,EACf,KAAK,0BAA0B,EAC/B,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC7B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,6BAA6B;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAuB,YAAW,YAAY,EAAE,0BAA0B;;gBAQvE,OAAO,EAAE,6BAA6B;IAwBlD,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS;IAUxF,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,eAAe,GAAG,SAAS;IAU1F,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAItC,KAAK,IAAI,IAAI;IAIb,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe;IAuBtD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAMvD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAanD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,IAAI;IA6BjE,IAAI,CAAC,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS,cAAc,EAAE;IAuDjE,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,eAAe,EAAE;IAsClE,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,GAAG,IAAI;IAuCtE,WAAW,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAuF/C,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI;CAgV3E"}
+{"version":3,"file":"PersistentSessionStore.d.ts","sourceRoot":"","sources":["../../sources/server/PersistentSessionStore.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACR,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EAGZ,mBAAmB,EACnB,cAAc,EACd,eAAe,EAElB,MAAM,sBAAsB,CAAC;AAK9B,OAAO,EACH,eAAe,EACf,KAAK,0BAA0B,EAC/B,KAAK,kBAAkB,EACvB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC7B,MAAM,sBAAsB,CAAC;AAG9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,MAAM,WAAW,6BAA6B;IAC1C,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACtB;AAED,qBAAa,sBAAuB,YAAW,YAAY,EAAE,0BAA0B;;gBASvE,OAAO,EAAE,6BAA6B;IA0BlD,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,GAAG,eAAe,GAAG,SAAS;IAUxF,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,eAAe,GAAG,SAAS;IAU1F,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAItC,KAAK,IAAI,IAAI;IAIb,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe;IA0BtD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAMvD,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAanD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAgCjE,IAAI,CAAC,OAAO,GAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,SAAS,cAAc,EAAE;IAyDjE,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,eAAe,EAAE;IAwDlE,yBAAyB,CAAC,MAAM,EAAE,mBAAmB,CAAC,QAAQ,CAAC,GAAG,IAAI;IAuCtE,WAAW,CAAC,KAAK,EAAE,qBAAqB,GAAG,IAAI;IAyG/C,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,GAAG,IAAI;CAsX3E"}

package/dist/server/PersistentSessionStore.js

@@ -2,6 +2,7 @@ import { chmodSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import { DatabaseSync } from "node:sqlite";
 import { createEventIdFactory } from "../protocol/index.js";
+import { parsePermissionMode } from "../permissions/index.js";
 import { InMemorySession, } from "./InMemorySession.js";
 import { AgentSessionManager } from "./AgentSessionManager.js";
 import { createModelCatalog } from "./createModelCatalog.js";
@@ -10,10 +11,12 @@ export class PersistentSessionStore {
     #createEventId = createEventIdFactory();
     #database;
     #modelCatalog;
+    #mcpToolProvider;
     #now;
     #sessions = new Map();
     constructor(options) {
         this.#modelCatalog = options.modelCatalog ?? createModelCatalog();
+        this.#mcpToolProvider = options.mcpToolProvider;
         this.#now = options.now ?? Date.now;
         if (options.databasePath !== ":memory:") {
             mkdirSync(dirname(options.databasePath), { mode: 0o700, recursive: true });
@@ -27,6 +30,7 @@ export class PersistentSessionStore {
             repository: {
                 createSubagent: (request, metadata) => this.#createSession(request, metadata),
                 get: (sessionId) => this.get(sessionId),
+                listByRoot: (rootSessionId) => this.#listSubagentSessionsByRoot(rootSessionId),
             },
         });
         if (options.databasePath !== ":memory:") {
@@ -66,6 +70,9 @@ export class PersistentSessionStore {
             createEventId: this.#createEventId,
             emitCreatedEvent: false,
             modelCatalog: this.#modelCatalog,
+            ...(this.#mcpToolProvider !== undefined
+                ? { mcpToolProvider: this.#mcpToolProvider }
+                : {}),
             ...(metadata !== undefined ? { metadata } : {}),
             onAppendEvent: (event) => this.#appendEvent(event),
             persistence: this,
@@ -98,17 +105,19 @@ export class PersistentSessionStore {
                     session_id,
                     run_id,
                     display_text,
+                    kind,
                     text,
                     user_message_json,
                     created_at_ms
                 )
-                VALUES (?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
                 ON CONFLICT(session_id, run_id) DO UPDATE SET
                     display_text = excluded.display_text,
+                    kind = excluded.kind,
                     text = excluded.text,
                     user_message_json = excluded.user_message_json
                 `)
-            .run(sessionId, run.runId, run.displayText, run.text, JSON.stringify(run.userMessage), this.#now());
+            .run(sessionId, run.runId, run.displayText, run.kind, run.text, JSON.stringify(run.userMessage), this.#now());
     }
     list(options = {}) {
         const rows = this.#database
@@ -118,6 +127,7 @@ export class PersistentSessionStore {
                     cwd,
                     provider_id,
                     model_id,
+                    permission_mode,
                     effort,
                     status,
                     title,
@@ -147,6 +157,7 @@ export class PersistentSessionStore {
                 cwd: readString(row, "cwd"),
                 providerId: readString(row, "provider_id"),
                 modelId: readString(row, "model_id"),
+                permissionMode: parsePermissionMode(readString(row, "permission_mode")),
                 ...(effort !== undefined ? { effort } : {}),
                 status: readString(row, "status"),
                 titleStatus: readString(row, "title_status"),
@@ -171,6 +182,7 @@ export class PersistentSessionStore {
                     status,
                     parent_session_id,
                     parent_tool_call_id,
+                    task_name,
                     depth,
                     description,
                     created_at_ms,
@@ -182,6 +194,7 @@ export class PersistentSessionStore {
             .all(parentSessionId)
             .map((row) => {
             const parentToolCallId = readOptionalString(row, "parent_tool_call_id");
+            const taskName = readOptionalString(row, "task_name");
             return {
                 agentId: readString(row, "agent_id"),
                 createdAt: readNumber(row, "created_at_ms"),
@@ -192,10 +205,23 @@ export class PersistentSessionStore {
                 parentSessionId: readString(row, "parent_session_id"),
                 ...(parentToolCallId !== undefined ? { parentToolCallId } : {}),
                 status: readString(row, "status"),
+                ...(taskName !== undefined ? { taskName } : {}),
                 updatedAt: readNumber(row, "updated_at_ms"),
             };
         });
     }
+    #listSubagentSessionsByRoot(rootSessionId) {
+        return this.#database
+            .prepare(`
+                SELECT id
+                FROM sessions
+                WHERE root_session_id = ? AND session_kind = 'subagent'
+                ORDER BY created_at_ms ASC
+                `)
+            .all(rootSessionId)
+            .map((row) => this.get(readString(row, "id")))
+            .filter((session) => session !== undefined);
+    }
     repairInterruptedSessions(reason) {
         const rows = this.#database
             .prepare(`
@@ -240,6 +266,7 @@ export class PersistentSessionStore {
                     root_session_id,
                     depth,
                     parent_tool_call_id,
+                    task_name,
                     description,
                     cwd,
                     provider_id,
@@ -248,8 +275,13 @@ export class PersistentSessionStore {
                     instructions,
                     status,
                     active_run_id,
+                    permission_mode,
+                    context_messages_json,
                     models_json,
                     tools_json,
+                    tasks_json,
+                    goal_json,
+                    next_task_id,
                     title,
                     title_status,
                     title_error,
@@ -259,7 +291,7 @@ export class PersistentSessionStore {
                     created_at_ms,
                     updated_at_ms
                 )
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 ON CONFLICT(id) DO UPDATE SET
                     agent_id = excluded.agent_id,
                     session_kind = excluded.session_kind,
@@ -267,6 +299,7 @@ export class PersistentSessionStore {
                     root_session_id = excluded.root_session_id,
                     depth = excluded.depth,
                     parent_tool_call_id = excluded.parent_tool_call_id,
+                    task_name = excluded.task_name,
                     description = excluded.description,
                     cwd = excluded.cwd,
                     provider_id = excluded.provider_id,
@@ -275,8 +308,13 @@ export class PersistentSessionStore {
                     instructions = excluded.instructions,
                     status = excluded.status,
                     active_run_id = excluded.active_run_id,
+                    permission_mode = excluded.permission_mode,
+                    context_messages_json = excluded.context_messages_json,
                     models_json = excluded.models_json,
                     tools_json = excluded.tools_json,
+                    tasks_json = excluded.tasks_json,
+                    goal_json = excluded.goal_json,
+                    next_task_id = excluded.next_task_id,
                     title = excluded.title,
                     title_status = excluded.title_status,
                     title_error = excluded.title_error,
@@ -285,7 +323,7 @@ export class PersistentSessionStore {
                     last_message_at_ms = excluded.last_message_at_ms,
                     updated_at_ms = excluded.updated_at_ms
                 `)
-            .run(state.id, state.agentId, state.agent.type, state.agent.parentSessionId ?? null, state.agent.rootSessionId, state.agent.depth, state.agent.parentToolCallId ?? null, state.agent.description ?? null, state.cwd, state.providerId, state.modelId, state.effort ?? null, state.instructions ?? null, state.status, state.activeRunId ?? null, JSON.stringify(state.models), JSON.stringify(state.tools), state.title ?? null, state.titleStatus, state.titleError ?? null, state.interruption === undefined ? 0 : 1, state.interruption === undefined ? null : JSON.stringify(state.interruption), state.lastMessageAt ?? null, this.#now(), this.#now());
+            .run(state.id, state.agentId, state.agent.type, state.agent.parentSessionId ?? null, state.agent.rootSessionId, state.agent.depth, state.agent.parentToolCallId ?? null, state.agent.taskName ?? null, state.agent.description ?? null, state.cwd, state.providerId, state.modelId, state.effort ?? null, state.instructions ?? null, state.status, state.activeRunId ?? null, state.permissionMode, state.contextMessages === undefined ? null : JSON.stringify(state.contextMessages), JSON.stringify(state.models), JSON.stringify(state.tools), JSON.stringify(state.tasks), state.goal === undefined ? null : JSON.stringify(state.goal), state.nextTaskId, state.title ?? null, state.titleStatus, state.titleError ?? null, state.interruption === undefined ? 0 : 1, state.interruption === undefined ? null : JSON.stringify(state.interruption), state.lastMessageAt ?? null, this.#now(), this.#now());
     }
     upsertMessage(sessionId, message) {
         this.#database
@@ -349,6 +387,7 @@ export class PersistentSessionStore {
                 root_session_id TEXT,
                 depth INTEGER NOT NULL DEFAULT 0,
                 parent_tool_call_id TEXT,
+                task_name TEXT,
                 description TEXT,
                 cwd TEXT NOT NULL,
                 provider_id TEXT NOT NULL,
@@ -358,8 +397,13 @@ export class PersistentSessionStore {
                 status TEXT NOT NULL,
                 active_run_id TEXT,
                 last_event_id TEXT,
+                permission_mode TEXT NOT NULL DEFAULT 'workspace_write',
+                context_messages_json TEXT,
                 models_json TEXT NOT NULL,
                 tools_json TEXT NOT NULL,
+                tasks_json TEXT NOT NULL DEFAULT '[]',
+                goal_json TEXT,
+                next_task_id INTEGER NOT NULL DEFAULT 1,
                 title TEXT,
                 title_status TEXT NOT NULL DEFAULT 'idle',
                 title_error TEXT,
@@ -401,6 +445,7 @@ export class PersistentSessionStore {
                 session_id TEXT NOT NULL REFERENCES sessions(id) ON DELETE CASCADE,
                 run_id TEXT NOT NULL,
                 display_text TEXT NOT NULL,
+                kind TEXT NOT NULL DEFAULT 'user',
                 text TEXT NOT NULL,
                 user_message_json TEXT NOT NULL,
                 created_at_ms INTEGER NOT NULL,
@@ -416,7 +461,14 @@ export class PersistentSessionStore {
         this.#ensureSessionColumn("root_session_id", "TEXT");
         this.#ensureSessionColumn("depth", "INTEGER NOT NULL DEFAULT 0");
         this.#ensureSessionColumn("parent_tool_call_id", "TEXT");
+        this.#ensureSessionColumn("task_name", "TEXT");
         this.#ensureSessionColumn("description", "TEXT");
+        this.#ensureSessionColumn("context_messages_json", "TEXT");
+        this.#ensureSessionColumn("permission_mode", "TEXT NOT NULL DEFAULT 'workspace_write'");
+        this.#ensureSessionColumn("tasks_json", "TEXT NOT NULL DEFAULT '[]'");
+        this.#ensureSessionColumn("goal_json", "TEXT");
+        this.#ensureSessionColumn("next_task_id", "INTEGER NOT NULL DEFAULT 1");
+        this.#ensureQueuedRunColumn("kind", "TEXT NOT NULL DEFAULT 'user'");
         this.#database.exec(`
             CREATE INDEX IF NOT EXISTS sessions_parent_created
                 ON sessions(parent_session_id, created_at_ms)
@@ -464,7 +516,7 @@ export class PersistentSessionStore {
     #loadQueuedRuns(sessionId) {
         return this.#database
             .prepare(`
-                SELECT run_id, display_text, text, user_message_json
+                SELECT run_id, display_text, kind, text, user_message_json
                 FROM queued_runs
                 WHERE session_id = ?
                 ORDER BY created_at_ms ASC
@@ -472,6 +524,7 @@ export class PersistentSessionStore {
             .all(sessionId)
             .map((row) => ({
             displayText: readString(row, "display_text"),
+            kind: readString(row, "kind"),
             runId: readString(row, "run_id"),
             text: readString(row, "text"),
             userMessage: JSON.parse(readString(row, "user_message_json")),
@@ -496,9 +549,13 @@ export class PersistentSessionStore {
         const title = readOptionalString(row, "title");
         const titleError = readOptionalString(row, "title_error");
         const activeRunId = readOptionalString(row, "active_run_id");
+        const contextMessagesJson = readOptionalString(row, "context_messages_json");
+        const permissionMode = parsePermissionMode(readString(row, "permission_mode"));
         const parentSessionId = readOptionalString(row, "parent_session_id");
         const parentToolCallId = readOptionalString(row, "parent_tool_call_id");
+        const taskName = readOptionalString(row, "task_name");
         const description = readOptionalString(row, "description");
+        const goalJson = readOptionalString(row, "goal_json");
         const id = readString(row, "id");
         const agent = {
             depth: readNumber(row, "depth"),
@@ -507,14 +564,19 @@ export class PersistentSessionStore {
             ...(description !== undefined ? { description } : {}),
             ...(parentSessionId !== undefined ? { parentSessionId } : {}),
             ...(parentToolCallId !== undefined ? { parentToolCallId } : {}),
+            ...(taskName !== undefined ? { taskName } : {}),
         };
         const restore = {
             agent,
             agentId: readString(row, "agent_id"),
             cwd: readString(row, "cwd"),
+            ...(contextMessagesJson !== undefined
+                ? { contextMessages: JSON.parse(contextMessagesJson) }
+                : {}),
             ...(effort !== undefined ? { effort } : {}),
             id,
             ...(instructions !== undefined ? { instructions } : {}),
+            ...(goalJson !== undefined ? { goal: JSON.parse(goalJson) } : {}),
             ...(interruptionJson !== undefined
                 ? { interruption: JSON.parse(interruptionJson) }
                 : {}),
@@ -523,8 +585,11 @@ export class PersistentSessionStore {
             modelId,
             models: JSON.parse(readString(row, "models_json")),
             providerId: readString(row, "provider_id"),
+            permissionMode,
             queuedRuns: this.#loadQueuedRuns(sessionId),
             status: readString(row, "status"),
+            tasks: JSON.parse(readString(row, "tasks_json")),
+            nextTaskId: readNumber(row, "next_task_id"),
             ...(title !== undefined ? { title } : {}),
             ...(titleError !== undefined ? { titleError } : {}),
             titleStatus: readString(row, "title_status"),
@@ -545,6 +610,9 @@ export class PersistentSessionStore {
             createEventId: this.#createEventId,
             events: this.#loadEvents(sessionId),
             modelCatalog: this.#modelCatalog,
+            ...(this.#mcpToolProvider !== undefined
+                ? { mcpToolProvider: this.#mcpToolProvider }
+                : {}),
             onAppendEvent: (event) => this.#appendEvent(event),
             persistence: this,
             request,
@@ -582,6 +650,13 @@ export class PersistentSessionStore {
         }
         this.#database.exec(`ALTER TABLE sessions ADD COLUMN ${name} ${definition}`);
     }
+    #ensureQueuedRunColumn(name, definition) {
+        const columns = this.#database.prepare("PRAGMA table_info(queued_runs)").all();
+        if (columns.some((column) => readString(column, "name") === name)) {
+            return;
+        }
+        this.#database.exec(`ALTER TABLE queued_runs ADD COLUMN ${name} ${definition}`);
+    }
 }
 function readNumber(row, key) {
     const value = row[key];

package/dist/server/createGoalTitle.d.ts

@@ -0,0 +1,2 @@
+export declare function createGoalTitle(objective: string): string;
+//# sourceMappingURL=createGoalTitle.d.ts.map

package/dist/server/createGoalTitle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"createGoalTitle.d.ts","sourceRoot":"","sources":["../../sources/server/createGoalTitle.ts"],"names":[],"mappings":"AAAA,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAGzD"}

package/dist/server/createGoalTitle.js

@@ -0,0 +1,4 @@
+export function createGoalTitle(objective) {
+    const singleLine = objective.replace(/\s+/gu, " ").trim();
+    return singleLine.length <= 80 ? singleLine : `${singleLine.slice(0, 79).trimEnd()}…`;
+}

package/dist/server/createProtocolHttpServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createProtocolHttpServer.d.ts","sourceRoot":"","sources":["../../sources/server/createProtocolHttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,MAAM,EAAuB,MAAM,WAAW,CAAC;AAGjG,OAAO,KAAK,EAUR,YAAY,EAMf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAqB,KAAK,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,MAAM,WAAW,yBAAyB;IACtC,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,yBAAyB,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CA2BnF"}
+{"version":3,"file":"createProtocolHttpServer.d.ts","sourceRoot":"","sources":["../../sources/server/createProtocolHttpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,MAAM,EAAuB,MAAM,WAAW,CAAC;AAGjG,OAAO,KAAK,EAeR,YAAY,EAQf,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAqB,KAAK,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAE3F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAItD,MAAM,WAAW,yBAAyB;IACtC,cAAc,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACvC,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,iBAAiB,CAAC,EAAE,yBAAyB,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CA2BnF"}

package/dist/server/createProtocolHttpServer.js

@@ -3,6 +3,8 @@ import { timingSafeEqual } from "node:crypto";
 import { InMemorySessionStore } from "./InMemorySessionStore.js";
 import { createModelCatalog } from "./createModelCatalog.js";
 import { FileSearchService } from "./FileSearchService.js";
+import { isPermissionMode } from "../permissions/index.js";
+import { isGoalStatus } from "../goals/index.js";
 export function createProtocolHttpServer(options) {
     const modelCatalog = options.modelCatalog ?? createModelCatalog();
     const store = options.store ??
@@ -51,6 +53,12 @@ async function handleRequest(request, response, store, initialization, fileSearc
     }
     if (request.method === "POST" && route.name === "sessions") {
         const body = await readJson(request);
+        if (body.permissionMode !== undefined && !isPermissionMode(body.permissionMode)) {
+            sendJson(response, 400, {
+                error: "Permission mode must be Auto, Workspace write, Read only, or Full access.",
+            });
+            return;
+        }
         const session = store.create(body);
         sendJson(response, 201, { session: session.snapshot() });
         return;
@@ -99,6 +107,18 @@ async function handleRequest(request, response, store, initialization, fileSearc
         sendJson(response, 202, session.submit(body));
         return;
     }
+    if (request.method === "POST" && route.name === "steer") {
+        const body = await readJson(request);
+        try {
+            sendJson(response, 202, session.steer(body));
+        }
+        catch (error) {
+            sendJson(response, 409, {
+                error: error instanceof Error ? error.message : "The active run cannot be steered.",
+            });
+        }
+        return;
+    }
     if (request.method === "POST" && route.name === "abort") {
         sendJson(response, 200, session.abort());
         return;
@@ -107,6 +127,14 @@ async function handleRequest(request, response, store, initialization, fileSearc
         sendJson(response, 200, { session: session.reset() });
         return;
     }
+    if (request.method === "POST" && route.name === "compact") {
+        const result = await session.compact();
+        sendJson(response, 200, {
+            result,
+            session: session.snapshot(),
+        });
+        return;
+    }
     if (request.method === "PATCH" && route.name === "effort") {
         const body = await readJson(request);
         sendJson(response, 200, { session: session.changeEffort(body) });
@@ -117,6 +145,77 @@ async function handleRequest(request, response, store, initialization, fileSearc
         sendJson(response, 200, { session: session.changeModel(body) });
         return;
     }
+    if (request.method === "PATCH" && route.name === "permissions") {
+        const body = await readJson(request);
+        if (!isPermissionMode(body.permissionMode)) {
+            sendJson(response, 400, {
+                error: "Permission mode must be Auto, Workspace write, Read only, or Full access.",
+            });
+            return;
+        }
+        sendJson(response, 200, { session: session.changePermissionMode(body) });
+        return;
+    }
+    if (request.method === "POST" && route.name === "goal") {
+        const body = await readJson(request);
+        if (typeof body.objective !== "string") {
+            sendJson(response, 400, { error: "Goal objective must be text." });
+            return;
+        }
+        try {
+            session.setGoal(body);
+            sendJson(response, 200, { session: session.snapshot() });
+        }
+        catch (error) {
+            sendJson(response, 409, {
+                error: error instanceof Error ? error.message : "The goal could not be started.",
+            });
+        }
+        return;
+    }
+    if (request.method === "PATCH" && route.name === "goal") {
+        const body = await readJson(request);
+        if (!isGoalStatus(body.status)) {
+            sendJson(response, 400, {
+                error: "Goal status must be Active, Paused, Blocked, or Complete.",
+            });
+            return;
+        }
+        try {
+            session.changeGoalStatus(body);
+            sendJson(response, 200, { session: session.snapshot() });
+        }
+        catch (error) {
+            sendJson(response, 409, {
+                error: error instanceof Error ? error.message : "The goal could not be updated.",
+            });
+        }
+        return;
+    }
+    if (request.method === "DELETE" && route.name === "goal") {
+        session.clearGoal();
+        sendJson(response, 200, { session: session.snapshot() });
+        return;
+    }
+    if (request.method === "POST" && route.name === "user-input") {
+        const body = await readJson(request);
+        try {
+            const snapshot = session.answerUserInput(route.requestId, body);
+            if (snapshot === undefined) {
+                sendJson(response, 409, {
+                    error: "This question is no longer waiting for an answer.",
+                });
+                return;
+            }
+            sendJson(response, 200, { session: snapshot });
+        }
+        catch (error) {
+            sendJson(response, 400, {
+                error: error instanceof Error ? error.message : "The answer is invalid.",
+            });
+        }
+        return;
+    }
     if (request.method === "GET" && route.name === "events") {
         const events = session.events.since(url.searchParams.get("after") ?? undefined);
         if (events === undefined) {
@@ -218,31 +317,49 @@ function matchRoute(pathname) {
     const sessionId = decodeURIComponent(parts[1]);
     if (parts.length === 2)
         return { name: "session", sessionId };
+    if (parts.length === 4 && parts[2] === "user-input" && parts[3] !== undefined) {
+        return {
+            name: "user-input",
+            requestId: decodeURIComponent(parts[3]),
+            sessionId,
+        };
+    }
     if (parts.length !== 3)
         return undefined;
     if (parts[2] === "abort")
         return { name: "abort", sessionId };
+    if (parts[2] === "compact")
+        return { name: "compact", sessionId };
     if (parts[2] === "effort")
         return { name: "effort", sessionId };
     if (parts[2] === "events")
         return { name: "events", sessionId };
     if (parts[2] === "files")
         return { name: "files", sessionId };
+    if (parts[2] === "goal")
+        return { name: "goal", sessionId };
     if (parts[2] === "messages")
         return { name: "messages", sessionId };
     if (parts[2] === "model")
         return { name: "model", sessionId };
+    if (parts[2] === "permissions")
+        return { name: "permissions", sessionId };
     if (parts[2] === "reset")
         return { name: "reset", sessionId };
     if (parts[2] === "stream")
         return { name: "stream", sessionId };
+    if (parts[2] === "steer")
+        return { name: "steer", sessionId };
     if (parts[2] === "subagents")
         return { name: "subagents", sessionId };
     return undefined;
 }
 function isSessionMutation(routeName, method) {
-    return ((method === "POST" && ["abort", "messages", "reset"].includes(routeName)) ||
-        (method === "PATCH" && ["effort", "model"].includes(routeName)));
+    return ((method === "POST" &&
+        ["abort", "compact", "messages", "reset", "steer"].includes(routeName)) ||
+        (["DELETE", "PATCH", "POST"].includes(method ?? "") && routeName === "goal") ||
+        (method === "POST" && routeName === "user-input") ||
+        (method === "PATCH" && ["effort", "model", "permissions"].includes(routeName)));
 }
 async function readJson(request) {
     const chunks = [];

package/dist/server/runLocalProtocolServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runLocalProtocolServer.d.ts","sourceRoot":"","sources":["../../sources/server/runLocalProtocolServer.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,6BAA6B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,sBAAsB,CACxC,OAAO,GAAE,6BAAkC,GAC5C,OAAO,CAAC,IAAI,CAAC,CA+Df"}
+{"version":3,"file":"runLocalProtocolServer.d.ts","sourceRoot":"","sources":["../../sources/server/runLocalProtocolServer.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,6BAA6B;IAC1C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,sBAAsB,CACxC,OAAO,GAAE,6BAAkC,GAC5C,OAAO,CAAC,IAAI,CAAC,CA8Ef"}

package/dist/server/runLocalProtocolServer.js

@@ -6,6 +6,7 @@ import { prepareLocalServerDirectory } from "./prepareLocalServerDirectory.js";
 import { PersistentSessionStore } from "./PersistentSessionStore.js";
 import { readLocalServerToken } from "./readLocalServerToken.js";
 import { removeStaleSocket } from "./removeStaleSocket.js";
+import { McpClientManager } from "../mcp/index.js";
 export async function runLocalProtocolServer(options = {}) {
     const paths = getLocalServerPaths();
     const socketPath = options.socketPath ?? paths.socketPath;
@@ -14,7 +15,12 @@ export async function runLocalProtocolServer(options = {}) {
     const token = await readLocalServerToken(tokenPath);
     await removeStaleSocket(socketPath);
     const modelCatalog = createModelCatalog({ cwd: process.cwd() });
-    const store = new PersistentSessionStore({ databasePath: paths.databasePath, modelCatalog });
+    const mcpToolProvider = new McpClientManager();
+    const store = new PersistentSessionStore({
+        databasePath: paths.databasePath,
+        mcpToolProvider,
+        modelCatalog,
+    });
     let stopServer;
     const server = createProtocolHttpServer({
         modelCatalog,
@@ -67,7 +73,17 @@ export async function runLocalProtocolServer(options = {}) {
     }
     finally {
         stopServer = undefined;
-        store.close();
+        try {
+            await mcpToolProvider.close();
+        }
+        catch (error) {
+            console.error(error instanceof Error
+                ? `Failed to close MCP connections: ${error.message}`
+                : `Failed to close MCP connections: ${String(error)}`);
+        }
+        finally {
+            store.close();
+        }
     }
 }
 async function writeRegistry(path, payload) {

package/dist/tasks/index.d.ts

@@ -0,0 +1,2 @@
+export type { CreateTaskRequest, SessionTask, TaskStatus, UpdateTaskRequest, UpdateTaskResult, } from "./types.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/tasks/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../sources/tasks/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACR,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,gBAAgB,GACnB,MAAM,YAAY,CAAC"}

package/dist/tasks/index.js

@@ -0,0 +1 @@
+export {};