@akira-tl/forgerelay 0.7.2 → 0.7.4

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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

package/capabilities/subagents/GUIDE.md

@@ -103,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/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/sessions/capability.js

@@ -9,18 +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({
@@ -118,17 +123,19 @@ export class SubagentSessionCapability {
         };
     }
     launch(request) {
+        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, { controller, completion });
+        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 });
@@ -158,6 +165,58 @@ export class SubagentSessionCapability {
             ...(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)
             return;

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,13 +93,38 @@ 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);
@@ -112,6 +140,11 @@ export class SubagentSessionManager {
     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,18 @@ 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);
     }
@@ -160,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.2",
+  "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/subagents/sessions/mcp/lifecycle.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",