@akira-tl/forgerelay 0.7.1 → 0.7.4

package/CHANGELOG.md

@@ -4,6 +4,28 @@ All notable ForgeRelay changes are documented here.
 
 ## [Unreleased]
 
+## [0.7.4] - 2026-08-30
+
+### Added
+
+- Subagent Run restart reconciliation now preserves live owners and marks stale active Runs `interrupted` without replaying the old prompt.
+- First-class Subagent Sessions now work through Workspace Relay and Composite explicit-member routing while keeping Session state on the Execution ForgeRelay.
+
+### Fixed
+
+- Composite Capability result remapping now preserves the declared output schema during relayed Subagent operations.
+
+## [0.7.2] - 2026-08-30
+
+### Added
+
+- `subagent.session stop/delete` 提供真实 Run 取消和显式 ForgeRelay Session 清理；取消后可继续 resume，active Session 不能直接 delete。
+
+### Changed
+
+- `SubagentStart` / `SubagentStop` 按 Run 触发，只携带有界身份与状态元数据；不传 prompt、response 或 provider session ID。
+- `delete` 只清理 ForgeRelay coordination/mailbox，provider-native conversation history 保持不变。
+
 ## [0.7.1] - 2026-08-30
 
 ### Added

package/capabilities/subagents/GUIDE.md

@@ -13,12 +13,14 @@ name = subagent.session
 action = run
 ```
 
-当前支持四个 operation：
+当前支持六个 operation：
 
 - `start`：创建 Subagent Session，并立即启动第一个 Subagent Run；
 - `resume`：在支持真实 continuation 的 provider 上继续现有 Session；
 - `status`：读取当前 Workspace 中一个 Session 的协调状态；
-- `list`：列出当前 Workspace 拥有的 Session 摘要。
+- `list`：列出当前 Workspace 拥有的 Session 摘要；
+- `stop`：取消当前 active Run，但保留 Session；
+- `delete`：显式删除 idle Session 的 ForgeRelay coordination state。
 
 `subagent.session` 不支持 `batch.execute`。
 
@@ -82,7 +84,13 @@ action = run
 
 Session 受实际 Execution Workspace 所有权约束；Session ID 不是跨 Workspace 的访问凭证。`status` / `resume` 都只能访问当前实际 Execution Workspace 拥有的 Session，`list` 也只返回当前 Workspace 的紧凑摘要。
 
-Session 返回中会给出 `continuationSupported` 与 `resumable`；`open_workspace` 的 provider metadata 也会明确给出 `continuationSupported`。当前尚未通过 first-class Capability 开放 `stop` 或 `delete`，不要伪造这些 operation，也不要用新的 Core MCP tool 绕过 Capability Gateway。
+Session 返回中会给出 `continuationSupported` 与 `resumable`；`open_workspace` 的 provider metadata 也会明确给出 `continuationSupported`。不要用新的 Core MCP tool 绕过 Capability Gateway。
+
+## stop / delete
+
+`stop` 只取消当前 active Run，并等待 provider execution 真正观察取消后才返回。取消完成后 Run 状态为 `cancelled`，Session 回到 `idle`；如果已有 provider continuation identity，之后仍可 `resume`。对 idle Session 调用 `stop` 是幂等的。
+
+`delete` 只允许 idle Session。它只删除 ForgeRelay 的 Session mapping 和尚未领取的 delivery mailbox，不删除或修改 Claude Code、Codex、OpenCode、Pi、Cursor/Copilot 等 provider-native conversation/session history。ForgeRelay 不自动清理 Subagent Session；只有显式 `delete` 才删除协调状态。
 
 ## 后台完成与结果交付
 
@@ -95,6 +103,8 @@ Run 完成后：
 - 成功领取后 mailbox 条目立即删除，同一个 completion 不重复交付；
 - 未领取 completion 可以跨正常 ForgeRelay 进程重启保留。
 
+ForgeRelay 只为 active Run 持久化最小 execution-owner 元数据（owner identity / PID），不保存 delegated prompt。后续 Session 操作会先做 restart reconciliation：能够证明 owner 仍存活的 Run 保持 `running`；无法证明仍有执行 owner 的 Run 一次性转为 `interrupted`，Session 回到 `idle`。ForgeRelay 绝不自动 replay 被中断 Run 的旧 prompt；如果 provider continuation 仍有效，由 Host 显式 `resume` 新 prompt。
+
 如果需要等待结果，使用 `status` 进行有节制的后续查询；不要高频短轮询。
 
 ## 数据所有权

package/dist/capability-registry.js

@@ -147,6 +147,14 @@ export function createCapabilityRegistry(dependencies) {
             operation: z.literal("status"),
             sessionId: z.string().min(1),
         }).strict(),
+        z.object({
+            operation: z.literal("stop"),
+            sessionId: z.string().min(1),
+        }).strict(),
+        z.object({
+            operation: z.literal("delete"),
+            sessionId: z.string().min(1),
+        }).strict(),
         z.object({ operation: z.literal("list") }).strict(),
     ]);
     const codeIntelligenceInput = z.discriminatedUnion("operation", [

package/dist/cli.js

@@ -580,7 +580,8 @@ function createCliSubagentSessionManager(config = loadConfig()) {
     return new SubagentSessionManager(config, {
         launch(request) {
             const promptFile = writeSubagentPromptFile(request.prompt);
-            spawnSubagentWorker(request.sessionId, promptFile);
+            const pid = spawnSubagentWorker(request.sessionId, promptFile);
+            return pid === undefined ? undefined : { id: `subagent-worker-${request.runId}`, pid };
         },
     });
 }
@@ -599,6 +600,7 @@ function spawnSubagentWorker(sessionId, promptFile) {
         env: process.env,
     });
     child.unref();
+    return child.pid;
 }
 function writeSubagentPromptFile(prompt) {
     const directory = mkdtempSync(join(tmpdir(), "forgerelay-agent-prompt-"));

package/dist/db/migrations.js

@@ -69,6 +69,11 @@ const migrations = [
         name: "subagent-session-coordination",
         up: migrateSubagentSessionCoordination,
     },
+    {
+        version: 15,
+        name: "subagent-run-ownership",
+        up: migrateSubagentRunOwnership,
+    },
 ];
 export function migrateDatabase(sqlite) {
     const migrate = sqlite.transaction(() => {
@@ -358,6 +363,11 @@ function migrateSubagentSessionCoordination(sqlite) {
     addColumnIfMissing(sqlite, "local_agent_sessions", "latest_run_outcome", "text");
     addColumnIfMissing(sqlite, "local_agent_sessions", "latest_run_finished_at", "text");
 }
+function migrateSubagentRunOwnership(sqlite) {
+    migrateSubagentSessionCoordination(sqlite);
+    addColumnIfMissing(sqlite, "local_agent_sessions", "active_owner_id", "text");
+    addColumnIfMissing(sqlite, "local_agent_sessions", "active_owner_pid", "integer");
+}
 function migrateActivityHostTurnWorkspace(sqlite) {
     migrateActivityHostTurns(sqlite);
     addColumnIfMissing(sqlite, "activity_host_turns", "workspace_id", "text");

package/dist/db/schema.js

@@ -155,6 +155,8 @@ export const localAgentSessions = sqliteTable("local_agent_sessions", {
     activeRunId: text("active_run_id"),
     activeActivityId: text("active_activity_id"),
     activeRunStartedAt: text("active_run_started_at"),
+    activeOwnerId: text("active_owner_id"),
+    activeOwnerPid: integer("active_owner_pid"),
     latestRunId: text("latest_run_id"),
     latestRunOutcome: text("latest_run_outcome"),
     latestRunFinishedAt: text("latest_run_finished_at"),

package/dist/server.js

@@ -2764,6 +2764,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         outputSchema: {
             name: z.string(),
             action: z.enum(["describe", "run"]),
+            member: z.string().optional(),
             capability: z.unknown().optional(),
             result: z.unknown().optional(),
             error: capabilityErrorOutputSchema.optional(),

package/dist/subagents/providers/adapters/acp.js

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
-import { asRecord, assertPipedChild, directString, errorMessage, readArray, } from "../shared.js";
+import { asRecord, assertPipedChild, directString, errorMessage, readArray, terminateChildOnAbort, } from "../shared.js";
 const ACP_COMMANDS = {
     cursor: ["cursor-agent", "acp"],
     copilot: ["copilot", "--acp"],
@@ -24,6 +24,7 @@ export class AcpSubagentAdapter {
             windowsHide: true,
         });
         assertPipedChild(child);
+        const detachAbort = terminateChildOnAbort(child, input.signal);
         let stderr = "";
         child.stderr.on("data", (chunk) => {
             stderr += chunk.toString("utf8");
@@ -80,6 +81,7 @@ export class AcpSubagentAdapter {
             throw new Error(`${this.provider} ACP run failed: ${errorMessage(error)}${stderr ? `\n${stderr.trim()}` : ""}`);
         }
         finally {
+            detachAbort();
             child.kill();
         }
     }

package/dist/subagents/providers/adapters/claude.js

@@ -1,42 +1,49 @@
 import { spawnSync } from "node:child_process";
-import { directString, requireFinalResponse } from "../shared.js";
+import { directString, linkedAbortController, requireFinalResponse } from "../shared.js";
 export class ClaudeSubagentAdapter {
     provider = "claude";
     async run(input) {
         const { query } = await import("@anthropic-ai/claude-agent-sdk");
         const claudeExecutable = process.env.CLAUDE_COMMAND ?? resolveExecutable("claude");
-        const messages = query({
-            prompt: input.prompt,
-            options: {
-                cwd: input.workspace,
-                model: input.model,
-                ...(input.thinking ? { thinking: { type: "adaptive" }, effort: input.thinking } : {}),
-                resume: input.providerSessionId,
-                permissionMode: "bypassPermissions",
-                allowDangerouslySkipPermissions: true,
-                env: claudeCommandEnvironment(process.env),
-                ...(claudeExecutable ? { pathToClaudeCodeExecutable: claudeExecutable } : {}),
-            },
-        });
-        let providerSessionId = input.providerSessionId ?? null;
-        let finalResponse = "";
-        for await (const message of messages) {
-            const record = message;
-            if (typeof record.session_id === "string")
-                providerSessionId = record.session_id;
-            if (record.type === "result" && typeof record.result === "string") {
-                const resultError = claudeResultError(record);
-                if (resultError)
-                    throw new Error(resultError);
-                finalResponse = record.result;
+        const linkedAbort = linkedAbortController(input.signal);
+        try {
+            const messages = query({
+                prompt: input.prompt,
+                options: {
+                    cwd: input.workspace,
+                    model: input.model,
+                    ...(input.thinking ? { thinking: { type: "adaptive" }, effort: input.thinking } : {}),
+                    resume: input.providerSessionId,
+                    permissionMode: "bypassPermissions",
+                    allowDangerouslySkipPermissions: true,
+                    env: claudeCommandEnvironment(process.env),
+                    ...(linkedAbort.controller ? { abortController: linkedAbort.controller } : {}),
+                    ...(claudeExecutable ? { pathToClaudeCodeExecutable: claudeExecutable } : {}),
+                },
+            });
+            let providerSessionId = input.providerSessionId ?? null;
+            let finalResponse = "";
+            for await (const message of messages) {
+                const record = message;
+                if (typeof record.session_id === "string")
+                    providerSessionId = record.session_id;
+                if (record.type === "result" && typeof record.result === "string") {
+                    const resultError = claudeResultError(record);
+                    if (resultError)
+                        throw new Error(resultError);
+                    finalResponse = record.result;
+                }
             }
+            finalResponse = requireFinalResponse("Claude", finalResponse);
+            return {
+                provider: this.provider,
+                providerSessionId,
+                finalResponse,
+            };
+        }
+        finally {
+            linkedAbort.dispose();
         }
-        finalResponse = requireFinalResponse("Claude", finalResponse);
-        return {
-            provider: this.provider,
-            providerSessionId,
-            finalResponse,
-        };
     }
 }
 function claudeResultError(record) {

package/dist/subagents/providers/adapters/codex.js

@@ -29,7 +29,7 @@ export class CodexSdkSubagentRuntime {
         const thread = input.providerSessionId
             ? this.codex.resumeThread(input.providerSessionId, options)
             : this.codex.startThread(options);
-        const turn = await thread.run(input.prompt);
+        const turn = await thread.run(input.prompt, { signal: input.signal });
         return {
             provider: this.provider,
             providerSessionId: thread.id,

package/dist/subagents/providers/adapters/opencode.js

@@ -6,15 +6,31 @@ export class OpencodeSubagentAdapter {
         const { client, server } = await createOpencode();
         try {
             const sessionId = input.providerSessionId ?? await createOpencodeSession(client, input);
-            const promptResult = await promptOpencodeSession(client, sessionId, input);
-            await waitForOpencodeSession(client, sessionId);
-            const messages = await readOpencodeMessages(client, sessionId);
-            const finalResponse = requireFinalResponse("OpenCode", extractOpenCodeFinalResponse(messages) || extractOpenCodeFinalResponse(promptResult));
-            return {
-                provider: this.provider,
-                providerSessionId: sessionId,
-                finalResponse,
+            let abortPromise;
+            const abort = () => {
+                abortPromise ??= abortOpencodeSession(client, sessionId, input.workspace);
             };
+            if (input.signal?.aborted)
+                abort();
+            else
+                input.signal?.addEventListener("abort", abort, { once: true });
+            try {
+                input.signal?.throwIfAborted();
+                const promptResult = await promptOpencodeSession(client, sessionId, input);
+                await waitForOpencodeSession(client, sessionId, input.signal);
+                const messages = await readOpencodeMessages(client, sessionId, input.signal);
+                const finalResponse = requireFinalResponse("OpenCode", extractOpenCodeFinalResponse(messages) || extractOpenCodeFinalResponse(promptResult));
+                return {
+                    provider: this.provider,
+                    providerSessionId: sessionId,
+                    finalResponse,
+                };
+            }
+            finally {
+                input.signal?.removeEventListener("abort", abort);
+                if (abortPromise)
+                    await abortPromise;
+            }
         }
         finally {
             server.close();
@@ -27,7 +43,7 @@ async function createOpencodeSession(client, input) {
         directory: input.workspace,
         location: { directory: input.workspace },
         ...(input.model ? { model: parseOpencodeModel(input.model) } : {}),
-    }, { throwOnError: true });
+    }, { throwOnError: true, signal: input.signal });
     const id = readNestedString(result, ["id"]) ??
         readNestedString(result, ["data", "id"]) ??
         readNestedString(result, ["session", "id"]) ??
@@ -47,19 +63,30 @@ async function promptOpencodeSession(client, sessionId, input) {
         ...(input.model ? { model: parseOpencodeModel(input.model) } : {}),
         ...(input.thinking ? { variant: input.thinking } : {}),
     };
-    return session.prompt(promptInput, { throwOnError: true });
+    return session.prompt(promptInput, { throwOnError: true, signal: input.signal });
 }
-async function waitForOpencodeSession(client, sessionId) {
+async function waitForOpencodeSession(client, sessionId, signal) {
     const session = client.session;
     if (!session?.wait)
         return;
-    await session.wait({ sessionID: sessionId }, { throwOnError: true });
+    await session.wait({ sessionID: sessionId }, { throwOnError: true, signal });
 }
-async function readOpencodeMessages(client, sessionId) {
+async function readOpencodeMessages(client, sessionId, signal) {
     const session = client.session;
     if (!session?.messages)
         return undefined;
-    return session.messages({ sessionID: sessionId, order: "asc", limit: 100 }, { throwOnError: true });
+    return session.messages({ sessionID: sessionId, order: "asc", limit: 100 }, { throwOnError: true, signal });
+}
+async function abortOpencodeSession(client, sessionId, workspace) {
+    const session = client.session;
+    if (!session?.abort)
+        return;
+    try {
+        await session.abort({ sessionID: sessionId, directory: workspace }, { throwOnError: true });
+    }
+    catch {
+        // The prompt request may already have observed the AbortSignal and closed the local server.
+    }
 }
 function parseOpencodeModel(model) {
     const separator = model.indexOf("/");

package/dist/subagents/providers/adapters/pi.js

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { removeDevspaceNodeModulesBinFromPath } from "../path.js";
-import { asRecord, assertPipedChild, errorMessage, readArray, readNestedString, requireFinalResponse, unwrapProviderPayload, } from "../shared.js";
+import { asRecord, assertPipedChild, errorMessage, readArray, readNestedString, requireFinalResponse, terminateChildOnAbort, unwrapProviderPayload, } from "../shared.js";
 const PI_AGENT_TIMEOUT_MS = 120_000;
 export class PiRpcSubagentAdapter {
     provider = "pi";
@@ -19,6 +19,7 @@ export class PiRpcSubagentAdapter {
             windowsHide: true,
         });
         assertPipedChild(child);
+        const detachAbort = terminateChildOnAbort(child, input.signal);
         const rpc = new JsonLineRpc(child);
         let streamingText = "";
         let streamingProviderError = "";
@@ -33,7 +34,7 @@ export class PiRpcSubagentAdapter {
         try {
             const state = await rpc.request({ type: "get_state" });
             const providerSessionId = readNestedString(state, ["sessionId"]) ?? input.providerSessionId ?? null;
-            const done = rpc.waitForEvent((event) => asRecord(event)?.type === "agent_end", PI_AGENT_TIMEOUT_MS);
+            const done = rpc.waitForEvent((event) => asRecord(event)?.type === "agent_end", PI_AGENT_TIMEOUT_MS, input.signal);
             await rpc.request({ type: "prompt", message: input.prompt });
             const agentEnd = await done;
             const sessionMessages = await rpc.request({ type: "get_messages" });
@@ -55,6 +56,7 @@ export class PiRpcSubagentAdapter {
             };
         }
         finally {
+            detachAbort();
             child.kill();
         }
     }
@@ -103,19 +105,31 @@ class JsonLineRpc {
         this.eventSubscribers.add(callback);
         return () => this.eventSubscribers.delete(callback);
     }
-    waitForEvent(predicate, timeoutMs) {
+    waitForEvent(predicate, timeoutMs, signal) {
         return new Promise((resolve, reject) => {
-            const timer = setTimeout(() => {
+            const finish = (callback) => {
+                clearTimeout(timer);
                 unsubscribe();
+                signal?.removeEventListener("abort", abort);
+                callback();
+            };
+            const abort = () => finish(() => {
+                const error = new Error("Pi RPC cancelled.");
+                error.name = "AbortError";
+                reject(error);
+            });
+            const timer = setTimeout(() => finish(() => {
                 reject(new Error(`Pi RPC timed out waiting for agent completion\n${this.stderr}`.trim()));
-            }, timeoutMs);
+            }), timeoutMs);
             const unsubscribe = this.onEvent((event) => {
                 if (!predicate(event))
                     return;
-                clearTimeout(timer);
-                unsubscribe();
-                resolve(event);
+                finish(() => resolve(event));
             });
+            if (signal?.aborted)
+                abort();
+            else
+                signal?.addEventListener("abort", abort, { once: true });
         });
     }
     handleStdout(chunk) {

package/dist/subagents/providers/shared.js

@@ -38,3 +38,29 @@ export function requireFinalResponse(provider, response) {
     }
     return trimmed;
 }
+export function linkedAbortController(signal) {
+    if (!signal)
+        return { dispose() { } };
+    const controller = new AbortController();
+    const abort = () => controller.abort(signal.reason);
+    if (signal.aborted)
+        abort();
+    else
+        signal.addEventListener("abort", abort, { once: true });
+    return {
+        controller,
+        dispose() {
+            signal.removeEventListener("abort", abort);
+        },
+    };
+}
+export function terminateChildOnAbort(child, signal) {
+    if (!signal)
+        return () => { };
+    const abort = () => child.kill();
+    if (signal.aborted)
+        abort();
+    else
+        signal.addEventListener("abort", abort, { once: true });
+    return () => signal.removeEventListener("abort", abort);
+}

package/dist/subagents/sessions/capability.js

@@ -9,17 +9,23 @@ export class SubagentSessionCapability {
     activityLifecycle;
     mailbox;
     providerRunner;
+    ownerAliveOverride;
+    activeRuns = new Map();
     constructor(config, activityLifecycle, options = {}) {
         this.config = config;
         this.activityLifecycle = activityLifecycle;
         this.mailbox = new SubagentDeliveryMailbox(config.stateDir);
         this.providerRunner = options.providerRunner ?? defaultProviderRunner;
+        this.ownerAliveOverride = options.ownerAlive;
     }
     async run(input, context, options) {
         const manager = new SubagentSessionManager(this.config, {
             launch: (request) => this.launch(request),
         });
         try {
+            const reconciled = manager.reconcile({ workspaceId: context.workspaceId }, (run) => this.ownerAlive(run));
+            for (const entry of reconciled)
+                this.recordInterruption(entry, options.activityId);
             switch (input.operation) {
                 case "start": {
                     const started = await manager.start({
@@ -67,6 +73,18 @@ export class SubagentSessionCapability {
                         },
                     };
                 }
+                case "stop":
+                    return { value: await this.stop(manager, input.sessionId, context.workspaceId) };
+                case "delete": {
+                    const deleted = manager.delete(input.sessionId, { workspaceId: context.workspaceId });
+                    this.mailbox.discardSession(deleted.id);
+                    return {
+                        value: {
+                            operation: "delete",
+                            deletedSessionId: deleted.id,
+                        },
+                    };
+                }
                 case "list":
                     return {
                         value: {
@@ -105,12 +123,99 @@ export class SubagentSessionCapability {
         };
     }
     launch(request) {
-        void executeSubagentRun(this.config, request, this.providerRunner)
-            .then((completion) => this.recordCompletion(completion))
-            .catch(() => {
-            // The worker writes durable Session/mailbox state for provider failures.
-            // An unexpected orchestration failure must not become an unhandled rejection.
+        const ownerId = `subagent-owner-${process.pid}-${request.runId}`;
+        const controller = new AbortController();
+        const completion = executeSubagentRun(this.config, { ...request, signal: controller.signal }, this.providerRunner).then((result) => {
+            this.recordCompletion(result);
+            return result;
+        });
+        this.activeRuns.set(request.runId, { ownerId, controller, completion });
+        void completion.finally(() => {
+            this.activeRuns.delete(request.runId);
+        }).catch(() => {
+            // Unexpected orchestration failures surface through later reconciliation.
+        });
+        return { id: ownerId, pid: process.pid };
+    }
+    async stop(manager, sessionId, workspaceId) {
+        let session = manager.get(sessionId, { workspaceId });
+        if (!session) {
+            throw new SubagentSessionError("subagent.session_not_found", `Unknown Subagent Session in this Workspace: ${sessionId}`);
+        }
+        const activeRun = session.activeRun;
+        if (!activeRun) {
+            return { operation: "stop", session: publicSession(session) };
+        }
+        const handle = this.activeRuns.get(activeRun.id);
+        if (!handle) {
+            session = manager.get(session.id, { workspaceId }) ?? session;
+            if (!session.activeRun)
+                return { operation: "stop", session: publicSession(session) };
+            throw new SubagentSessionError("subagent.cancel_unavailable", `Subagent Run ${activeRun.id} has no live cancellation owner.`);
+        }
+        handle.controller.abort(new Error(`Subagent Run ${activeRun.id} cancelled by stop.`));
+        await handle.completion;
+        session = manager.get(session.id, { workspaceId });
+        if (!session) {
+            throw new SubagentSessionError("subagent.session_not_found", `Unknown Subagent Session in this Workspace: ${sessionId}`);
+        }
+        return {
+            operation: "stop",
+            session: publicSession(session),
+            ...(session.latestRun?.id === activeRun.id ? { run: publicRun(session.latestRun) } : {}),
+        };
+    }
+    ownerAlive(run) {
+        if (this.ownerAliveOverride)
+            return this.ownerAliveOverride(run);
+        if (!run.ownerId || run.ownerPid === undefined)
+            return false;
+        const active = this.activeRuns.get(run.id);
+        if (run.ownerPid === process.pid)
+            return active?.ownerId === run.ownerId;
+        try {
+            process.kill(run.ownerPid, 0);
+            return true;
+        }
+        catch (error) {
+            return error.code === "EPERM";
+        }
+    }
+    recordInterruption(entry, fallbackActivityId) {
+        const sourceActivityId = entry.run.activityId ?? fallbackActivityId;
+        if (!sourceActivityId)
+            return;
+        const record = () => this.activityLifecycle.recordLinked({
+            sourceActivityId,
+            tool: "subagent_result",
+            request: { sessionId: entry.session.id, runId: entry.run.id },
+            result: {
+                sessionId: entry.session.id,
+                runId: entry.run.id,
+                provider: entry.session.provider,
+                status: "interrupted",
+            },
+            outcome: { type: "failed", error: "Subagent Run interrupted." },
         });
+        try {
+            record();
+        }
+        catch {
+            if (!fallbackActivityId || fallbackActivityId === sourceActivityId)
+                return;
+            this.activityLifecycle.recordLinked({
+                sourceActivityId: fallbackActivityId,
+                tool: "subagent_result",
+                request: { sessionId: entry.session.id, runId: entry.run.id },
+                result: {
+                    sessionId: entry.session.id,
+                    runId: entry.run.id,
+                    provider: entry.session.provider,
+                    status: "interrupted",
+                },
+                outcome: { type: "failed", error: "Subagent Run interrupted." },
+            });
+        }
     }
     recordCompletion(completion) {
         if (!completion.activityId)

package/dist/subagents/sessions/delivery-mailbox.js

@@ -39,6 +39,9 @@ export class SubagentDeliveryMailbox {
     hasSession(sessionId) {
         return this.files().includes(`${sessionId}.json`);
     }
+    discardSession(sessionId) {
+        rmSync(this.pathFor(sessionId), { force: true });
+    }
     claim(predicate) {
         const deliveries = [];
         for (const file of this.files()) {

package/dist/subagents/sessions/execution.js

@@ -27,73 +27,64 @@ export async function executeSubagentRun(config, input, providerRunner = runSuba
                 thinking: record.thinking,
             },
         };
-        await hooks.run("SubagentStart", hookInvocation);
+        let outcome = "succeeded";
+        let result;
+        let errorMessage;
         try {
-            const result = await runSessionProvider(config, record, input.prompt, providerRunner);
-            await hooks.run("SubagentStop", {
-                ...hookInvocation,
-                payload: {
-                    ...hookInvocation.payload,
-                    status: "succeeded",
-                    providerSessionId: result.providerSessionId,
-                },
-            });
-            const finishedAt = new Date().toISOString();
-            store.update(record.id, {
-                providerSessionId: result.providerSessionId ?? undefined,
-                status: "idle",
-                activeRun: undefined,
-                latestRun: {
-                    id: input.runId,
-                    status: "succeeded",
-                    finishedAt,
-                },
-            });
-            if (record.workspaceId) {
-                mailbox.write({
-                    sessionId: record.id,
-                    runId: input.runId,
-                    workspaceId: record.workspaceId,
-                    ...(input.activityId ? { activityId: input.activityId } : {}),
-                    provider: record.provider,
-                    outcome: "succeeded",
-                    finalResponse: result.finalResponse,
-                });
-            }
-            return completion(record, input, "succeeded");
+            await hooks.run("SubagentStart", hookInvocation);
+            input.signal?.throwIfAborted();
+            result = await runSessionProvider(config, record, input.prompt, providerRunner, input.signal);
+            input.signal?.throwIfAborted();
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : String(error);
+            if (isCancelled(error, input.signal)) {
+                outcome = "cancelled";
+                errorMessage = "Subagent Run cancelled.";
+            }
+            else {
+                outcome = "failed";
+                errorMessage = error instanceof Error ? error.message : String(error);
+            }
+        }
+        try {
             await hooks.run("SubagentStop", {
                 ...hookInvocation,
                 payload: {
                     ...hookInvocation.payload,
-                    status: "failed",
+                    status: outcome,
                 },
             });
-            const finishedAt = new Date().toISOString();
-            store.update(record.id, {
-                status: "idle",
-                activeRun: undefined,
-                latestRun: {
-                    id: input.runId,
-                    status: "failed",
-                    finishedAt,
-                },
-            });
-            if (record.workspaceId) {
-                mailbox.write({
-                    sessionId: record.id,
-                    runId: input.runId,
-                    workspaceId: record.workspaceId,
-                    ...(input.activityId ? { activityId: input.activityId } : {}),
-                    provider: record.provider,
-                    outcome: "failed",
-                    error: message,
-                });
+        }
+        catch (error) {
+            if (outcome === "succeeded") {
+                outcome = "failed";
+                errorMessage = error instanceof Error ? error.message : String(error);
             }
-            return completion(record, input, "failed", message);
         }
+        const finishedAt = new Date().toISOString();
+        store.update(record.id, {
+            ...(result?.providerSessionId ? { providerSessionId: result.providerSessionId } : {}),
+            status: "idle",
+            activeRun: undefined,
+            latestRun: {
+                id: input.runId,
+                status: outcome,
+                finishedAt,
+            },
+        });
+        if (record.workspaceId) {
+            mailbox.write({
+                sessionId: record.id,
+                runId: input.runId,
+                workspaceId: record.workspaceId,
+                ...(input.activityId ? { activityId: input.activityId } : {}),
+                provider: record.provider,
+                outcome,
+                ...(outcome === "succeeded" && result ? { finalResponse: result.finalResponse } : {}),
+                ...(outcome !== "succeeded" && errorMessage ? { error: errorMessage } : {}),
+            });
+        }
+        return completion(record, input, outcome, errorMessage);
     }
     finally {
         store.close();
@@ -118,7 +109,7 @@ export async function executeSubagentSession(config, sessionId, prompt) {
         store.close();
     }
 }
-async function runSessionProvider(config, session, prompt, providerRunner) {
+async function runSessionProvider(config, session, prompt, providerRunner, signal) {
     if (!isSubagentProvider(session.provider)) {
         throw new Error(`Unknown subagent provider for Session ${session.id}: ${session.provider}`);
     }
@@ -130,6 +121,7 @@ async function runSessionProvider(config, session, prompt, providerRunner) {
             writeMode: "allowed",
             model: session.model,
             thinking: session.thinking,
+            signal,
         });
     }
     if (session.profileName === session.provider) {
@@ -139,15 +131,16 @@ async function runSessionProvider(config, session, prompt, providerRunner) {
             writeMode: "allowed",
             model: session.model,
             thinking: session.thinking,
+            signal,
         });
     }
     const profiles = await loadSubagentProfiles(config, session.workspaceRoot);
     const profile = profiles.find((candidate) => candidate.name === session.profileName);
     if (!profile)
         throw new Error(`Subagent profile not found: ${session.profileName}`);
-    return runSubagentProfile(profile, session, prompt, providerRunner);
+    return runSubagentProfile(profile, session, prompt, providerRunner, signal);
 }
-async function runSubagentProfile(profile, session, prompt, providerRunner) {
+async function runSubagentProfile(profile, session, prompt, providerRunner, signal) {
     const body = profile.body.trim();
     const firstPrompt = body ? `${body}\n\nTask:\n${prompt}` : prompt;
     return providerRunner(session.provider, {
@@ -156,8 +149,12 @@ async function runSubagentProfile(profile, session, prompt, providerRunner) {
         writeMode: "allowed",
         model: session.model,
         thinking: session.thinking,
+        signal,
     });
 }
+function isCancelled(error, signal) {
+    return signal?.aborted === true || (error instanceof Error && error.name === "AbortError");
+}
 function completion(session, input, outcome, error) {
     return {
         sessionId: session.id,

package/dist/subagents/sessions/manager.js

@@ -52,13 +52,16 @@ export class SubagentSessionManager {
         const run = session.activeRun;
         if (!run)
             throw new Error(`Subagent Session ${session.id} did not create an active Run.`);
-        this.launcher.launch({
+        const owned = this.assignOwner(session, run, this.launcher.launch({
             sessionId: session.id,
             runId,
             ...(input.activityId ? { activityId: input.activityId } : {}),
             prompt: input.prompt,
-        });
-        return { session, run };
+        }));
+        return {
+            session: owned,
+            run: owned.activeRun ?? (owned.latestRun?.id === run.id ? owned.latestRun : run),
+        };
     }
     resume(input, scope = {}) {
         const existing = this.store.getInScope(input.sessionId, scope);
@@ -90,17 +93,58 @@ export class SubagentSessionManager {
             status: "running",
             activeRun: run,
         });
-        this.launcher.launch({
+        const owned = this.assignOwner(session, run, this.launcher.launch({
             sessionId: session.id,
             runId,
             ...(input.activityId ? { activityId: input.activityId } : {}),
             prompt: input.prompt,
-        });
-        return { session, run };
+        }));
+        return {
+            session: owned,
+            run: owned.activeRun ?? (owned.latestRun?.id === run.id ? owned.latestRun : run),
+        };
+    }
+    reconcile(scope, ownerAlive) {
+        const reconciled = [];
+        for (const session of this.store.list(scope)) {
+            const run = session.activeRun;
+            if (!run || ownerAlive(run))
+                continue;
+            const interrupted = {
+                id: run.id,
+                status: "interrupted",
+                ...(run.activityId ? { activityId: run.activityId } : {}),
+                ...(run.startedAt ? { startedAt: run.startedAt } : {}),
+                finishedAt: new Date().toISOString(),
+            };
+            const updated = this.store.update(session.id, {
+                status: "idle",
+                activeRun: undefined,
+                latestRun: interrupted,
+            });
+            reconciled.push({ session: updated, run: interrupted });
+        }
+        return reconciled;
+    }
+    delete(sessionId, scope = {}) {
+        const session = this.store.getInScope(sessionId, scope);
+        if (!session) {
+            throw new SubagentSessionError("subagent.session_not_found", `Unknown Subagent Session in this Workspace: ${sessionId}`);
+        }
+        if (session.activeRun) {
+            throw new SubagentSessionError("subagent.busy", `Subagent Session ${session.id} already has active Run ${session.activeRun.id}.`);
+        }
+        this.store.delete(session.id);
+        return session;
     }
     close() {
         this.store.close();
     }
+    assignOwner(session, run, owner) {
+        if (!owner)
+            return session;
+        return this.store.assignActiveRunOwner(session.id, run.id, owner);
+    }
 }
 function newRunId() {
     return `run_${randomUUID().replaceAll("-", "").slice(0, 12)}`;

package/dist/subagents/sessions/mcp/runtime.js

@@ -3,6 +3,7 @@ export function createSubagentMcpRuntime(config, activityLifecycle, options = {}
     const capability = config.subagents
         ? new SubagentSessionCapability(config, activityLifecycle, {
             providerRunner: options.subagentProviderRunner,
+            ownerAlive: options.subagentOwnerAlive,
         })
         : undefined;
     return {

package/dist/subagents/sessions/store.js

@@ -47,6 +47,8 @@ export class SubagentSessionStore {
                         status: "running",
                         ...(input.activeRun.activityId ? { activityId: input.activeRun.activityId } : {}),
                         startedAt: input.activeRun.startedAt,
+                        ...(input.activeRun.ownerId ? { ownerId: input.activeRun.ownerId } : {}),
+                        ...(input.activeRun.ownerPid !== undefined ? { ownerPid: input.activeRun.ownerPid } : {}),
                     },
                 }
                 : {}),
@@ -67,6 +69,8 @@ export class SubagentSessionStore {
           active_run_id,
           active_activity_id,
           active_run_started_at,
+          active_owner_id,
+          active_owner_pid,
           latest_run_id,
           latest_run_outcome,
           latest_run_finished_at,
@@ -75,8 +79,8 @@ export class SubagentSessionStore {
           hook_reports_json,
           created_at,
           updated_at
-        ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, null, null, null, ?, ?)`)
-            .run(record.id, record.workspaceId ?? null, record.workspaceRoot, record.profileName, record.provider, record.model ?? null, record.thinking ?? null, null, record.status, record.activeRun?.id ?? null, record.activeRun?.activityId ?? null, record.activeRun?.startedAt ?? null, null, null, null, record.createdAt, record.updatedAt);
+        ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, null, null, null, ?, ?)`)
+            .run(record.id, record.workspaceId ?? null, record.workspaceRoot, record.profileName, record.provider, record.model ?? null, record.thinking ?? null, null, record.status, record.activeRun?.id ?? null, record.activeRun?.activityId ?? null, record.activeRun?.startedAt ?? null, record.activeRun?.ownerId ?? null, record.activeRun?.ownerPid ?? null, null, null, null, record.createdAt, record.updatedAt);
         return record;
     }
     get(idOrPrefix) {
@@ -126,6 +130,8 @@ export class SubagentSessionStore {
           active_run_id = ?,
           active_activity_id = ?,
           active_run_started_at = ?,
+          active_owner_id = ?,
+          active_owner_pid = ?,
           latest_run_id = ?,
           latest_run_outcome = ?,
           latest_run_finished_at = ?,
@@ -134,9 +140,21 @@ export class SubagentSessionStore {
           hook_reports_json = null,
           updated_at = ?
          where id = ?`)
-            .run(updated.workspaceId ?? null, resolve(updated.workspaceRoot), updated.profileName, updated.provider, updated.model ?? null, updated.thinking ?? null, updated.providerSessionId ?? null, updated.status, updated.activeRun?.id ?? null, updated.activeRun?.activityId ?? null, updated.activeRun?.startedAt ?? null, updated.latestRun?.id ?? null, updated.latestRun && updated.latestRun.status !== "running" ? updated.latestRun.status : null, updated.latestRun?.finishedAt ?? null, updated.updatedAt, updated.id);
+            .run(updated.workspaceId ?? null, resolve(updated.workspaceRoot), updated.profileName, updated.provider, updated.model ?? null, updated.thinking ?? null, updated.providerSessionId ?? null, updated.status, updated.activeRun?.id ?? null, updated.activeRun?.activityId ?? null, updated.activeRun?.startedAt ?? null, updated.activeRun?.ownerId ?? null, updated.activeRun?.ownerPid ?? null, updated.latestRun?.id ?? null, updated.latestRun && updated.latestRun.status !== "running" ? updated.latestRun.status : null, updated.latestRun?.finishedAt ?? null, updated.updatedAt, updated.id);
         return updated;
     }
+    assignActiveRunOwner(id, runId, owner) {
+        this.database.sqlite.prepare(`update local_agent_sessions
+          set active_owner_id = ?, active_owner_pid = ?, updated_at = ?
+        where id = ? and active_run_id = ?`).run(owner.id, owner.pid ?? null, new Date().toISOString(), id, runId);
+        const current = this.getById(id);
+        if (!current)
+            throw new Error(`Unknown subagent id: ${id}`);
+        return current;
+    }
+    delete(id) {
+        this.database.sqlite.prepare("delete from local_agent_sessions where id = ?").run(id);
+    }
     close() {
         this.database.close();
     }
@@ -157,6 +175,8 @@ function rowToSubagentSession(row) {
             status: "running",
             ...(row.active_activity_id ? { activityId: row.active_activity_id } : {}),
             ...(row.active_run_started_at ? { startedAt: row.active_run_started_at } : {}),
+            ...(row.active_owner_id ? { ownerId: row.active_owner_id } : {}),
+            ...(row.active_owner_pid !== null ? { ownerPid: row.active_owner_pid } : {}),
         }
         : undefined;
     const latestOutcome = readOutcome(row.latest_run_outcome);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akira-tl/forgerelay",
-  "version": "0.7.1",
+  "version": "0.7.4",
   "description": "Local development control plane for MCP coding agents.",
   "type": "module",
   "homepage": "https://github.com/Akira-TL/forgerelay#readme",
@@ -47,7 +47,7 @@
     "release:publish": "node scripts/release/publish.mjs",
     "postinstall": "node scripts/fix-node-pty-permissions.mjs",
     "start": "node dist/cli.js serve",
-    "test": "node --test scripts/debug/runtime.test.mjs scripts/release-proof.test.mjs scripts/release/release-gate.test.mjs scripts/release/release-version.test.mjs && tsx src/oauth/router.test.ts && tsx src/remote-auth-cli.test.ts && tsx src/remote-ssh-auth-cli.test.ts && tsx src/remote-workspace-relay.test.ts && tsx src/remote-workspace-relay-process.test.ts && tsx src/config.test.ts && tsx src/lsp/language-server-config.test.ts && tsx src/lsp/normalization/hover.test.ts && tsx src/lsp/references.server.test.ts && tsx src/lsp/operations/document-symbols.server.test.ts && tsx src/lsp/operations/workspace-symbols.server.test.ts && tsx src/lsp/operations/diagnostics-push.server.test.ts && tsx src/lsp/operations/diagnostics-pull.server.test.ts && tsx src/lsp/operations/request-hardening.server.test.ts && tsx src/lsp/operations/recovery.server.test.ts && tsx src/lsp/operations/lifecycle.server.test.ts && tsx src/lsp/runtime/semantic-requests.test.ts && tsx src/logger.test.ts && tsx src/proxy-trust.test.ts && tsx src/mcp-app-template.test.ts && tsx src/hooks.test.ts && tsx src/capability-registry.test.ts && tsx src/mcp/server-instructions.test.ts && tsx src/request-meta.test.ts && tsx src/incoming-artifacts.test.ts && tsx src/artifact-download.test.ts && tsx src/ui/card-types.test.ts && tsx src/ui/workspace-lifecycle-app.test.ts && tsx src/ui/activity/model.test.ts && tsx src/ui/patch-display.test.ts && tsx src/ui/tool-display.test.ts && tsx src/apply-patch.test.ts && tsx src/process-platform.test.ts && tsx src/process-sessions.test.ts && tsx src/mcp-sessions.test.ts && tsx src/server-shutdown.test.ts && tsx src/subagents/providers/adapters/codex.test.ts && tsx src/subagents/providers/registry.test.ts && tsx src/subagents/providers/availability.test.ts && tsx src/subagents/profiles.test.ts && tsx src/subagents/cli-target.test.ts && tsx src/subagents/sessions/store.test.ts && tsx src/subagents/sessions/manager.test.ts && tsx src/subagents/sessions/mcp/capability.server.test.ts && tsx src/subagents/sessions/mcp/continuation.server.test.ts && tsx src/roots.test.ts && tsx src/file-mutations.test.ts && tsx src/operations/edit-preflight.test.ts && tsx src/skills.test.ts && tsx src/db/migrations.test.ts && tsx src/workspace-store.test.ts && tsx src/activity/audit-store.test.ts && tsx src/activity/bash-output-store.test.ts && tsx src/activity/lifecycle.test.ts && tsx src/activity/query-service.test.ts && tsx src/operations/core-operation-executor.test.ts && tsx src/operations/bulk-mutation.test.ts && tsx src/operations/batch/scheduler.test.ts && tsx src/operations/batch/executor-policy.test.ts && tsx src/workspaces.test.ts && tsx src/workspace-conversation.test.ts && tsx src/review-checkpoints.test.ts && tsx src/lsp/code-intelligence.server.test.ts && npm run build:app && tsx src/server.test.ts && tsx src/oauth-store.test.ts && tsx src/cli.test.ts",
+    "test": "node --test scripts/debug/runtime.test.mjs scripts/release-proof.test.mjs scripts/release/release-gate.test.mjs scripts/release/release-version.test.mjs && tsx src/oauth/router.test.ts && tsx src/remote-auth-cli.test.ts && tsx src/remote-ssh-auth-cli.test.ts && tsx src/remote-workspace-relay.test.ts && tsx src/remote-workspace-relay-process.test.ts && tsx src/config.test.ts && tsx src/lsp/language-server-config.test.ts && tsx src/lsp/normalization/hover.test.ts && tsx src/lsp/references.server.test.ts && tsx src/lsp/operations/document-symbols.server.test.ts && tsx src/lsp/operations/workspace-symbols.server.test.ts && tsx src/lsp/operations/diagnostics-push.server.test.ts && tsx src/lsp/operations/diagnostics-pull.server.test.ts && tsx src/lsp/operations/request-hardening.server.test.ts && tsx src/lsp/operations/recovery.server.test.ts && tsx src/lsp/operations/lifecycle.server.test.ts && tsx src/lsp/runtime/semantic-requests.test.ts && tsx src/logger.test.ts && tsx src/proxy-trust.test.ts && tsx src/mcp-app-template.test.ts && tsx src/hooks.test.ts && tsx src/capability-registry.test.ts && tsx src/mcp/server-instructions.test.ts && tsx src/request-meta.test.ts && tsx src/incoming-artifacts.test.ts && tsx src/artifact-download.test.ts && tsx src/ui/card-types.test.ts && tsx src/ui/workspace-lifecycle-app.test.ts && tsx src/ui/activity/model.test.ts && tsx src/ui/patch-display.test.ts && tsx src/ui/tool-display.test.ts && tsx src/apply-patch.test.ts && tsx src/process-platform.test.ts && tsx src/process-sessions.test.ts && tsx src/mcp-sessions.test.ts && tsx src/server-shutdown.test.ts && tsx src/subagents/providers/adapters/codex.test.ts && tsx src/subagents/providers/registry.test.ts && tsx src/subagents/providers/availability.test.ts && tsx src/subagents/profiles.test.ts && tsx src/subagents/cli-target.test.ts && tsx src/subagents/sessions/store.test.ts && tsx src/subagents/sessions/manager.test.ts && tsx src/subagents/sessions/mcp/capability.server.test.ts && tsx src/subagents/sessions/mcp/continuation.server.test.ts && tsx src/subagents/sessions/mcp/lifecycle.server.test.ts && tsx src/subagents/sessions/mcp/reconciliation.server.test.ts && tsx src/subagents/sessions/mcp/routing.server.test.ts && tsx src/roots.test.ts && tsx src/file-mutations.test.ts && tsx src/operations/edit-preflight.test.ts && tsx src/skills.test.ts && tsx src/db/migrations.test.ts && tsx src/workspace-store.test.ts && tsx src/activity/audit-store.test.ts && tsx src/activity/bash-output-store.test.ts && tsx src/activity/lifecycle.test.ts && tsx src/activity/query-service.test.ts && tsx src/operations/core-operation-executor.test.ts && tsx src/operations/bulk-mutation.test.ts && tsx src/operations/batch/scheduler.test.ts && tsx src/operations/batch/executor-policy.test.ts && tsx src/workspaces.test.ts && tsx src/workspace-conversation.test.ts && tsx src/review-checkpoints.test.ts && tsx src/lsp/code-intelligence.server.test.ts && npm run build:app && tsx src/server.test.ts && tsx src/oauth-store.test.ts && tsx src/cli.test.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit",
     "release:check": "node scripts/release-version.mjs check",
     "release:tag-check": "node scripts/release-version.mjs tag",