@akira-tl/forgerelay 0.6.2 → 0.7.1

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

@@ -0,0 +1,19 @@
+import { SubagentSessionCapability } from "../capability.js";
+export function createSubagentMcpRuntime(config, activityLifecycle, options = {}) {
+    const capability = config.subagents
+        ? new SubagentSessionCapability(config, activityLifecycle, {
+            providerRunner: options.subagentProviderRunner,
+        })
+        : undefined;
+    return {
+        registryDependencies: capability
+            ? {
+                subagentSession: {
+                    available: true,
+                    run: (input, context, runOptions) => capability.run(input, context, runOptions),
+                },
+            }
+            : {},
+        decorateResult: (workspaceId, result) => capability?.decorateResult(workspaceId, result) ?? result,
+    };
+}

package/dist/{local-agent-store.js → subagents/sessions/store.js}

@@ -1,7 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { resolve } from "node:path";
-import { openDatabase } from "./db/client.js";
-export class LocalAgentStore {
+import { openDatabase } from "../../db/client.js";
+export class SubagentSessionStore {
     database;
     constructor(stateDir) {
         this.database = openDatabase(stateDir);
@@ -27,7 +27,7 @@ export class LocalAgentStore {
                 .prepare("select * from local_agent_sessions order by updated_at desc")
                 .all();
         }
-        return rows.map(rowToLocalAgentRecord);
+        return rows.map(rowToSubagentSession);
     }
     create(input) {
         const now = new Date().toISOString();
@@ -39,7 +39,17 @@ export class LocalAgentStore {
             provider: input.provider,
             model: input.model,
             thinking: input.thinking,
-            status: "starting",
+            status: input.activeRun ? "running" : "idle",
+            ...(input.activeRun
+                ? {
+                    activeRun: {
+                        id: input.activeRun.id,
+                        status: "running",
+                        ...(input.activeRun.activityId ? { activityId: input.activeRun.activityId } : {}),
+                        startedAt: input.activeRun.startedAt,
+                    },
+                }
+                : {}),
             createdAt: now,
             updatedAt: now,
         };
@@ -52,11 +62,21 @@ export class LocalAgentStore {
           provider,
           model,
           thinking,
+          provider_session_id,
           status,
+          active_run_id,
+          active_activity_id,
+          active_run_started_at,
+          latest_run_id,
+          latest_run_outcome,
+          latest_run_finished_at,
+          latest_response,
+          error,
+          hook_reports_json,
           created_at,
           updated_at
-        ) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-            .run(record.id, record.workspaceId ?? null, record.workspaceRoot, record.profileName, record.provider, record.model ?? null, record.thinking ?? null, record.status, 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, null, null, null, record.createdAt, record.updatedAt);
         return record;
     }
     get(idOrPrefix) {
@@ -66,13 +86,23 @@ export class LocalAgentStore {
          limit 1`)
             .get(idOrPrefix, idOrPrefix);
         if (exact)
-            return rowToLocalAgentRecord(exact);
+            return rowToSubagentSession(exact);
         const matches = this.database.sqlite
             .prepare(`select * from local_agent_sessions
          where id like ? escape '\\' or provider_session_id like ? escape '\\'
          order by updated_at desc`)
             .all(`${escapeLike(idOrPrefix)}%`, `${escapeLike(idOrPrefix)}%`);
-        return matches.length === 1 ? rowToLocalAgentRecord(matches[0]) : undefined;
+        return matches.length === 1 ? rowToSubagentSession(matches[0]) : undefined;
+    }
+    getInScope(idOrPrefix, scope) {
+        const session = this.get(idOrPrefix);
+        if (!session)
+            return undefined;
+        if (scope.workspaceId && session.workspaceId !== scope.workspaceId)
+            return undefined;
+        if (scope.workspaceRoot && session.workspaceRoot !== resolve(scope.workspaceRoot))
+            return undefined;
+        return session;
     }
     update(id, patch) {
         const current = this.getById(id);
@@ -93,12 +123,18 @@ export class LocalAgentStore {
           thinking = ?,
           provider_session_id = ?,
           status = ?,
-          latest_response = ?,
-          error = ?,
-          hook_reports_json = ?,
+          active_run_id = ?,
+          active_activity_id = ?,
+          active_run_started_at = ?,
+          latest_run_id = ?,
+          latest_run_outcome = ?,
+          latest_run_finished_at = ?,
+          latest_response = null,
+          error = null,
+          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.latestResponse ?? null, updated.error ?? null, updated.hookReports ? JSON.stringify(updated.hookReports) : 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.latestRun?.id ?? null, updated.latestRun && updated.latestRun.status !== "running" ? updated.latestRun.status : null, updated.latestRun?.finishedAt ?? null, updated.updatedAt, updated.id);
         return updated;
     }
     close() {
@@ -108,13 +144,29 @@ export class LocalAgentStore {
         const row = this.database.sqlite
             .prepare("select * from local_agent_sessions where id = ?")
             .get(id);
-        return row ? rowToLocalAgentRecord(row) : undefined;
+        return row ? rowToSubagentSession(row) : undefined;
     }
 }
-export function createLocalAgentStore(config) {
-    return new LocalAgentStore(config.stateDir);
+export function createSubagentSessionStore(config) {
+    return new SubagentSessionStore(config.stateDir);
 }
-function rowToLocalAgentRecord(row) {
+function rowToSubagentSession(row) {
+    const activeRun = row.active_run_id
+        ? {
+            id: row.active_run_id,
+            status: "running",
+            ...(row.active_activity_id ? { activityId: row.active_activity_id } : {}),
+            ...(row.active_run_started_at ? { startedAt: row.active_run_started_at } : {}),
+        }
+        : undefined;
+    const latestOutcome = readOutcome(row.latest_run_outcome);
+    const latestRun = row.latest_run_id && latestOutcome
+        ? {
+            id: row.latest_run_id,
+            status: latestOutcome,
+            ...(row.latest_run_finished_at ? { finishedAt: row.latest_run_finished_at } : {}),
+        }
+        : undefined;
     return {
         id: row.id,
         workspaceId: row.workspace_id ?? undefined,
@@ -124,34 +176,18 @@ function rowToLocalAgentRecord(row) {
         model: row.model ?? undefined,
         thinking: row.thinking ?? undefined,
         providerSessionId: row.provider_session_id ?? undefined,
-        status: readStatus(row.status),
-        latestResponse: row.latest_response ?? undefined,
-        error: row.error ?? undefined,
-        hookReports: parseHookReports(row.hook_reports_json),
+        status: activeRun || row.status === "starting" || row.status === "running" ? "running" : "idle",
+        ...(activeRun ? { activeRun } : {}),
+        ...(latestRun ? { latestRun } : {}),
         createdAt: row.created_at,
         updatedAt: row.updated_at,
     };
 }
-function parseHookReports(value) {
-    if (!value)
-        return undefined;
-    try {
-        const parsed = JSON.parse(value);
-        return Array.isArray(parsed) ? parsed : undefined;
-    }
-    catch {
-        return undefined;
-    }
-}
-function readStatus(status) {
-    if (status === "starting" ||
-        status === "running" ||
-        status === "idle" ||
-        status === "error" ||
-        status === "stopped") {
-        return status;
+function readOutcome(value) {
+    if (value === "succeeded" || value === "failed" || value === "cancelled" || value === "interrupted") {
+        return value;
     }
-    return "error";
+    return undefined;
 }
 function escapeLike(value) {
     return value.replaceAll("\\", "\\\\").replaceAll("%", "\\%").replaceAll("_", "\\_");

package/dist/workspaces.js

@@ -7,7 +7,7 @@ import { HookRunner } from "./hooks.js";
 import { closeManagedWorktree, createManagedWorktree, resolveManagedWorktreeBase, } from "./git-worktrees.js";
 import { AccessDeniedError, assertAllowedPath, isPathInsideRoot, resolveAllowedPath, } from "./roots.js";
 import { loadWorkspaceSkills, markSkillActivated, resolveSkillReadPath, } from "./skills.js";
-import { loadLocalAgentProfiles, } from "./local-agent-profiles.js";
+import { loadSubagentProfiles, } from "./subagents/profiles.js";
 const WORKSPACE_STALE_REMINDER_MS = 2 * 24 * 60 * 60 * 1_000;
 const WORKSPACE_SESSION_IDLE_TTL_MS = 30 * 24 * 60 * 60 * 1_000;
 const WORKSPACE_GC_INTERVAL_MS = 60 * 60 * 1_000;
@@ -634,7 +634,7 @@ export class WorkspaceRegistry {
     async reusedWorkspaceContext(workspace) {
         Object.assign(workspace, this.loadSkillsForWorkspace(workspace.root));
         workspace.capabilityGuides = loadCapabilityGuides(this.config);
-        workspace.agentProfiles = await loadLocalAgentProfiles(this.config, workspace.root);
+        workspace.agentProfiles = await loadSubagentProfiles(this.config, workspace.root);
         workspace.scannedInstructionDirs.clear();
         workspace.knownInstructionPathsByDir.clear();
         workspace.loadedInstructionRealPaths.clear();
@@ -800,7 +800,7 @@ export class WorkspaceRegistry {
             worktree: input.worktree,
             ...this.loadSkillsForWorkspace(input.root),
             capabilityGuides: loadCapabilityGuides(this.config),
-            agentProfiles: await loadLocalAgentProfiles(this.config, input.root),
+            agentProfiles: await loadSubagentProfiles(this.config, input.root),
             activatedSkillDirs: new Set(),
             activatedCapabilityGuideDirs: new Set(),
             scannedInstructionDirs: new Set(),

package/docs/chatgpt-coding-workflow.md

@@ -235,16 +235,9 @@ ForgeRelay-owned `subagents` capability guide when delegation is actually needed
 new setups. Existing user-authored or previously seeded Skills remain normal
 user configuration and are not deleted.
 
-The current model-facing delegation workflow is:
+Host 正常委派通过现有 `capability` Gateway 中的 `subagent.session` 完成，不增加新的 Core MCP tool。支持的生命周期操作包括 `start`、`resume`、`status`、`list`、`stop` 和 `delete`；具体参数与 provider continuation 能力以 `subagents` capability guide 为准。
 
-```bash
-forgerelay agents ls
-forgerelay agents run <profile-or-provider-or-id> "<prompt>"
-forgerelay agents show <id>
-```
-
-A first-class MCP subagent interface is planned so this CLI indirection can be
-removed.
+`forgerelay agents` CLI 继续保留给本地诊断和兼容场景，但 first-class MCP 路径不会通过 `bash -> forgerelay agents ...` 间接执行。Subagent Session 绑定实际 Execution Workspace，provider 原生 session/thread 保存 conversation history，ForgeRelay 只持久化必要的 ownership、continuation 和当前执行协调元数据。
 
 ## Tool modes
 

package/docs/roadmap.md

@@ -250,16 +250,51 @@ fake-LSP coverage remains the primary cross-platform protocol/lifecycle gate, wh
 `rust-analyzer`, `gopls`, and `clangd` only when those external executables are
 already present and otherwise reports explicit skips without installing them.
 
-## 0.5 — First-class subagent MCP
+## 0.5 — Durable Activity and batch execution
 
-ForgeRelay already owns provider adapters and resumable local agent sessions.
-The next step is to remove the current `bash -> forgerelay agents ...` indirection
-for MCP hosts.
+0.5 established the execution-history substrate used by the later MCP App and
+multi-workspace features:
+
+- immutable local Audit Events and restart-safe Activity Records;
+- durable Bash output plus late `bash_result` delivery;
+- Host Turn snapshots with lazy detail/output queries for MCP Apps;
+- native bulk read/edit/delete and heterogeneous `batch.execute` orchestration;
+- parent/child Activity relationships and bounded capability batch policies;
+- Windows-safe Activity/SQLite cleanup and release-test hardening.
+
+Activity remains an observation of semantic ForgeRelay operations rather than a
+second task/session runtime. Files, processes, Git state, and audit truth continue
+to belong to the Workspace that actually executes the operation.
+
+## 0.6 — Host UI, Workspace Relay, and Composite Workspace
+
+0.6 turned the Activity substrate into a Host-facing multi-environment workflow:
 
-First-class subagent operations should reuse the Capability Gateway established in 0.3 rather than add another top-level MCP tool. The exact registered names, action semantics and provider/session contract remain 0.5 design work. The parent agent will continue choosing from available provider/profile metadata while ForgeRelay owns provider-backed worker lifecycle state.
+- **0.6.0** — one ForgeRelay Panel per Host Turn, MCP Inspector/debug lifecycle,
+  virtual `skills://` loading, bounded process waits, and release-candidate support;
+- **0.6.1** — Workspace Relay, authenticated direct/SSH-routed remote execution,
+  restart-safe relay identity/routes, and remote Activity/bootstrap forwarding;
+- **0.6.2** — Composite Workspace as a first-class Workspace kind with named local,
+  managed-worktree, and relayed members, explicit member routing, aggregated
+  Composite Activity, and `close_workspace` dissolution that preserves members.
+
+The 0.6 contract keeps execution ownership explicit: Gateway ForgeRelay presents
+and routes; the selected member Workspace and its Execution ForgeRelay own files,
+Git state, processes, Hooks, Skills, Language services, Activity, and Audit facts.
+Workspace Relay is not file synchronization or failover, and Composite Workspace
+never silently chooses a member.
+
+## Later: first-class subagent MCP
+
+ForgeRelay already owns provider adapters and resumable local agent sessions. A
+future release may remove the current `bash -> forgerelay agents ...` indirection
+for MCP hosts.
 
-This is intentionally provider-backed delegation, not an attempt to emulate a
-host-native subagent implementation.
+First-class subagent operations should reuse the Capability Gateway rather than
+add another top-level MCP tool. The parent agent should continue choosing from
+available provider/profile metadata while ForgeRelay owns provider-backed worker
+lifecycle state. This remains provider-backed delegation, not an attempt to
+emulate a Host-native subagent implementation.
 
 ## Worktree and history refinements
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akira-tl/forgerelay",
-  "version": "0.6.2",
+  "version": "0.7.1",
   "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/local-agent-runtime.test.ts && tsx src/local-agent-adapters.test.ts && tsx src/local-agent-availability.test.ts && tsx src/local-agent-profiles.test.ts && tsx src/local-agent-targets.test.ts && tsx src/local-agent-store.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/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",

package/scripts/release/release-gate.test.mjs

@@ -79,7 +79,7 @@ test("release runtime and local parity share the checked-in Node contract", asyn
 test("cloud verification produces one reusable npm package on Linux", async () => {
   const workflow = await readFile(resolve(repoRoot, ".github/workflows/ci.yml"), "utf8");
   assert.match(workflow, /if:\s*runner\.os == 'Linux'[\s\S]*run:\s*npm run release:pack/);
-  assert.match(workflow, /uses:\s*actions\/upload-artifact@v4/);
+  assert.match(workflow, /uses:\s*actions\/upload-artifact@v7/);
   assert.match(workflow, /name:\s*npm-package/);
   assert.match(workflow, /include-hidden-files:\s*true/);
   assert.match(workflow, /overwrite:\s*true/);
@@ -89,7 +89,7 @@ test("release workflow is tag-only and promotes the verified npm artifact withou
   const workflow = await readFile(resolve(repoRoot, ".github/workflows/release.yml"), "utf8");
   assert.doesNotMatch(workflow, /workflow_dispatch:/);
   assert.match(workflow, /needs:\s*verify/);
-  assert.match(workflow, /uses:\s*actions\/download-artifact@v5/);
+  assert.match(workflow, /uses:\s*actions\/download-artifact@v7/);
   assert.match(workflow, /name:\s*npm-package/);
   assert.match(workflow, /run:\s*npm run release:publish/);
   assert.match(workflow, /npm install --global npm@11\.19\.1/);