@akira-tl/forgerelay 0.8.0 → 0.8.2

package/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable ForgeRelay changes are documented here.
 
 ## [Unreleased]
 
+## [0.8.2] - 2026-08-31
+
+### Changed
+
+- Managed-worktree Workspace close now preserves the same identity for later reopen with fresh backing; explicit delete safely finalizes active work before removing ForgeRelay-owned state.
+- Composite Workspace close now preserves identity and member topology for later reopen; explicit delete dissolves only the Composite relationship and leaves member Workspaces untouched.
+
+## [0.8.1] - 2026-08-30
+
+### Added
+
+- `close_workspace(action="delete")` explicitly removes ForgeRelay-owned checkout Workspace state without deleting or mutating project files.
+
+### Changed
+
+- Checkout Workspace close is now reversible: it preserves the canonical identity for reopen by path or ID, closed Workspaces remain listable but non-executable, legacy aliases resolve canonically, and idle GC no longer deletes persistent identity.
+
 ## [0.8.0] - 2026-08-30
 
 ### Changed

package/README.md

@@ -136,8 +136,10 @@ ForgeRelay does not merge member filesystems, Git state, Hooks, Skills, processe
 or audit facts, and it never infers a member from the tool type or purpose text.
 The Composite Activity Panel presents member operations in one Host Turn while the
 actual facts remain owned by the member Workspace. `close_workspace` on a Composite
-Workspace means **dissolve**: the Composite identity and membership are removed, but
-member Workspaces, worktrees, running jobs, files, and relay routes are preserved.
+Workspace now preserves the Composite identity and member topology as `closed`; a
+later `open_workspace` restores the same `cws_...` identity. `action="delete"` is the
+explicit dissolve operation. Neither close nor delete closes member Workspaces,
+finalizes their worktrees, stops their jobs, changes their files, or removes relay routes.
 
 ### Progressive MCP context
 

package/dist/composite-activity.js

@@ -12,7 +12,7 @@ export class CompositeActivityCoordinator {
         return this.composites.has(workspaceId);
     }
     beginPanel(workspaceId, conversationScopeId) {
-        this.composites.open(workspaceId);
+        this.composites.touchActive(workspaceId);
         const snapshot = this.queries.beginTurn(conversationScopeId, workspaceId);
         this.turns.set(snapshot.turnId, {
             compositeWorkspaceId: workspaceId,

package/dist/composite-workspaces.js

@@ -13,16 +13,20 @@ export class CompositeWorkspaceRegistry {
     has(workspaceId) {
         return this.records.has(workspaceId);
     }
+    isActive(workspaceId) {
+        return this.records.get(workspaceId)?.status === "active";
+    }
     create(name) {
         const normalized = normalizeName(name);
         const existing = [...this.records.values()].find((record) => record.name === normalized);
         if (existing)
-            return this.touch(existing.id);
+            return this.open(existing.id);
         const now = new Date().toISOString();
         const record = {
             id: `cws_${randomBytes(5).toString("hex")}`,
             kind: "composite",
             name: normalized,
+            status: "active",
             members: [],
             createdAt: now,
             lastUsedAt: now,
@@ -38,7 +42,17 @@ export class CompositeWorkspaceRegistry {
         return cloneRecord(record);
     }
     open(workspaceId) {
-        return this.touch(workspaceId);
+        const record = this.requireRecord(workspaceId);
+        record.status = "active";
+        return this.touchRecord(record);
+    }
+    close(workspaceId) {
+        const record = this.requireActive(workspaceId);
+        record.status = "closed";
+        return this.touchRecord(record);
+    }
+    touchActive(workspaceId) {
+        return this.touchRecord(this.requireActive(workspaceId));
     }
     list() {
         return [...this.records.values()]
@@ -46,7 +60,7 @@ export class CompositeWorkspaceRegistry {
             .sort((left, right) => right.lastUsedAt.localeCompare(left.lastUsedAt));
     }
     addMember(workspaceId, input) {
-        const record = this.requireRecord(workspaceId);
+        const record = this.requireActive(workspaceId);
         const name = normalizeMemberName(input.name);
         const purpose = input.purpose.trim();
         if (!purpose)
@@ -64,7 +78,7 @@ export class CompositeWorkspaceRegistry {
         return cloneRecord(record);
     }
     updateMember(workspaceId, memberName, input) {
-        const record = this.requireRecord(workspaceId);
+        const record = this.requireActive(workspaceId);
         const currentName = normalizeMemberName(memberName);
         const index = record.members.findIndex((member) => member.name === currentName);
         if (index < 0)
@@ -94,7 +108,7 @@ export class CompositeWorkspaceRegistry {
         return cloneRecord(record);
     }
     removeMember(workspaceId, memberName) {
-        const record = this.requireRecord(workspaceId);
+        const record = this.requireActive(workspaceId);
         const name = normalizeMemberName(memberName);
         const index = record.members.findIndex((member) => member.name === name);
         if (index < 0)
@@ -105,7 +119,7 @@ export class CompositeWorkspaceRegistry {
         return cloneRecord(record);
     }
     member(workspaceId, memberName) {
-        const record = this.requireRecord(workspaceId);
+        const record = this.requireActive(workspaceId);
         const name = normalizeMemberName(memberName);
         const member = record.members.find((entry) => entry.name === name);
         if (!member)
@@ -118,12 +132,18 @@ export class CompositeWorkspaceRegistry {
         this.persist();
         return cloneRecord(record);
     }
-    touch(workspaceId) {
-        const record = this.requireRecord(workspaceId);
+    touchRecord(record) {
         record.lastUsedAt = new Date().toISOString();
         this.persist();
         return cloneRecord(record);
     }
+    requireActive(workspaceId) {
+        const record = this.requireRecord(workspaceId);
+        if (record.status !== "active") {
+            throw new Error(`Composite Workspace ${workspaceId} is closed. Reopen it with open_workspace before use.`);
+        }
+        return record;
+    }
     requireRecord(workspaceId) {
         const record = this.records.get(workspaceId);
         if (!record)
@@ -140,7 +160,7 @@ export class CompositeWorkspaceRegistry {
                 return;
             throw new Error(`Failed to load Composite Workspace state: ${errorMessage(error)}`);
         }
-        if (parsed?.version !== 1 || !Array.isArray(parsed.workspaces)) {
+        if ((parsed?.version !== 1 && parsed?.version !== 2) || !Array.isArray(parsed.workspaces)) {
             throw new Error("Composite Workspace state has an unsupported format.");
         }
         for (const record of parsed.workspaces) {
@@ -148,6 +168,7 @@ export class CompositeWorkspaceRegistry {
                 continue;
             this.records.set(record.id, {
                 ...record,
+                status: record.status === "closed" ? "closed" : "active",
                 members: Array.isArray(record.members) ? record.members.map((member) => ({ ...member })) : [],
             });
         }
@@ -155,7 +176,7 @@ export class CompositeWorkspaceRegistry {
     persist() {
         mkdirSync(this.stateDir, { recursive: true });
         const state = {
-            version: 1,
+            version: 2,
             workspaces: [...this.records.values()].map(cloneRecord),
         };
         const tempPath = `${this.statePath}.${process.pid}.${randomBytes(4).toString("hex")}.tmp`;

package/dist/git-worktrees.js

@@ -57,6 +57,28 @@ export async function createManagedWorktree(input) {
         managed: true,
     };
 }
+export async function discardFreshManagedWorktree(input) {
+    const sourceRoot = assertAllowedPath(input.worktree.sourceRoot, input.config.allowedRoots);
+    const worktreePath = assertAllowedPath(input.worktree.path, [input.config.worktreeRoot]);
+    const worktreeBranch = await currentBranch(worktreePath);
+    if (worktreeBranch !== input.worktree.branch) {
+        throw new GitWorktreeError("GIT_WORKTREE_CLOSE_FAILED", `Cannot roll back reopened worktree because it is on branch ${JSON.stringify(worktreeBranch)} instead of ${JSON.stringify(input.worktree.branch)}.`);
+    }
+    if ((await git(["status", "--porcelain=v1"], worktreePath)).trim().length > 0) {
+        throw new GitWorktreeError("GIT_WORKTREE_CLOSE_FAILED", "Cannot roll back reopened worktree because it acquired uncommitted changes during reopen.");
+    }
+    const worktreeHead = (await git(["rev-parse", "HEAD"], worktreePath)).trim();
+    if (worktreeHead !== input.worktree.baseSha) {
+        throw new GitWorktreeError("GIT_WORKTREE_CLOSE_FAILED", "Cannot roll back reopened worktree because its branch advanced during reopen.");
+    }
+    try {
+        await git(["worktree", "remove", worktreePath], sourceRoot);
+        await git(["branch", "-D", input.worktree.branch], sourceRoot);
+    }
+    catch (error) {
+        throw new GitWorktreeError("GIT_WORKTREE_CLOSE_FAILED", `Git failed to remove the temporary managed worktree created for a failed reopen. ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
 export async function closeManagedWorktree(input) {
     const sourceRoot = assertAllowedPath(input.worktree.sourceRoot, input.config.allowedRoots);
     const worktreePath = assertAllowedPath(input.worktree.path, [input.config.worktreeRoot]);

package/dist/mcp/server-instructions.js

@@ -38,7 +38,7 @@ function capabilityContractInstructions(config) {
     const staleWorkspacePolicy = config.toolMode === "codex"
         ? ""
         : ` If ${toolNames.openWorkspace} reports stale workspaces, let the user choose resume or ${toolNames.closeWorkspace}; never auto-close.`;
-    const workspaceLifecycle = `Use ForgeRelay as a local coding workspace. Default to the user's existing checkout. Reuse workspaceId from ${toolNames.openWorkspace}; change it only when asked.${staleWorkspacePolicy} Only open mode=\"worktree\" when the user explicitly asks for isolated or parallel Git work. ${toolNames.closeWorkspace} releases checkout workspaces or finalizes managed worktrees; managed close requires commitMessage.`;
+    const workspaceLifecycle = `Default to the user's existing checkout. Reuse workspaceId from ${toolNames.openWorkspace}; change it only when asked.${staleWorkspacePolicy} Only open mode=\"worktree\" when the user explicitly asks for isolated or parallel Git work. ${toolNames.closeWorkspace} preserves Workspace identity. Managed close finalizes backing and needs commitMessage. Composite close preserves members; delete removes only Composite state. Active worktree delete still finalizes safely; checkout files are never deleted.`;
     const activityPanel = `Project-work order: ${toolNames.openWorkspace} if needed → activity_panel(workspaceId) once → work tools. activity_panel is the single ForgeRelay UI render tool: Workspace above Activity. A new workspaceId creates a new card. Never call activity_panel before needed ${toolNames.openWorkspace}.`;
     const agents = `Follow instructions returned by ${toolNames.openWorkspace}. Read an availableAgentsFiles path before working under it.`;
     const capabilityGuides = `For optional capabilities from ${toolNames.openWorkspace}, use ${toolNames.capability}; if unfamiliar, describe first and read its advertised capability guide with ${toolNames.read}.`;

package/dist/server.js

@@ -2078,6 +2078,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             memberAction: z.enum(["add", "update", "remove"]).optional(),
             kind: z.enum(["workspace", "composite"]).optional(),
             name: z.string().optional(),
+            status: z.string().optional(),
+            state: z.enum(["active", "stale", "invalid", "closed"]).optional(),
             members: z.array(z.object({
                 name: z.string(),
                 purpose: z.string(),
@@ -2134,6 +2136,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 workspaceId: z.string(),
                 kind: z.literal("composite"),
                 name: z.string(),
+                status: z.enum(["active", "closed"]),
+                state: z.enum(["active", "closed"]),
                 members: z.array(z.object({
                     name: z.string(),
                     purpose: z.string(),
@@ -2161,6 +2165,9 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             if (!workspaceId || !compositeWorkspaces.has(workspaceId)) {
                 throw new Error("open_workspace action=member requires an existing Composite Workspace workspaceId.");
             }
+            if (!compositeWorkspaces.isActive(workspaceId)) {
+                throw new Error(`Composite Workspace ${workspaceId} is closed. Reopen it with open_workspace before changing members.`);
+            }
             if (!memberAction || !member) {
                 throw new Error("open_workspace action=member requires memberAction and member.");
             }
@@ -2294,25 +2301,30 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 newWorkspace !== undefined || context !== undefined) {
                 throw new Error("open_workspace action=list does not accept path, relay, name, memberName, baseRef, newWorktree, newWorkspace, or context. Use kind/root/workspaceId/mode/status/state/staleOnly for inventory filters.");
             }
+            const compositeInventory = () => compositeWorkspaces.list()
+                .filter((entry) => workspaceId === undefined || entry.id === workspaceId)
+                .filter((entry) => status === undefined || entry.status === status)
+                .filter((entry) => state === undefined || entry.status === state)
+                .map((entry) => ({
+                workspaceId: entry.id,
+                kind: entry.kind,
+                name: entry.name,
+                status: entry.status,
+                state: entry.status,
+                members: entry.members,
+                createdAt: entry.createdAt,
+                lastUsedAt: entry.lastUsedAt,
+            }));
             if (kind === "composite") {
-                if (root !== undefined || mode !== undefined || status !== undefined || state !== undefined ||
-                    staleOnly !== undefined || offset !== undefined || limit !== undefined) {
-                    throw new Error("Composite Workspace inventory does not accept root/mode/status/state/staleOnly/offset/limit filters; use workspaceId when selecting one Composite Workspace.");
+                if (root !== undefined || mode !== undefined || staleOnly !== undefined ||
+                    offset !== undefined || limit !== undefined) {
+                    throw new Error("Composite Workspace inventory does not accept root/mode/staleOnly/offset/limit filters; use workspaceId/status/state when selecting Composite Workspaces.");
                 }
-                const composites = compositeWorkspaces.list()
-                    .filter((entry) => workspaceId === undefined || entry.id === workspaceId)
-                    .map((entry) => ({
-                    workspaceId: entry.id,
-                    kind: entry.kind,
-                    name: entry.name,
-                    members: entry.members,
-                    createdAt: entry.createdAt,
-                    lastUsedAt: entry.lastUsedAt,
-                }));
-                const instruction = "Resume a Composite Workspace with open_workspace(action=\"open\", workspaceId=...). Use close_workspace only when the user chooses to dissolve it.";
+                const composites = compositeInventory();
+                const instruction = "Open a Composite Workspace by workspaceId to resume or reopen it. close_workspace preserves its identity; action=delete permanently dissolves only Composite-owned state.";
                 const result = [
                     `Composite Workspace inventory: ${composites.length} matching record${composites.length === 1 ? "" : "s"}.`,
-                    ...composites.map((entry) => `${entry.name} [${entry.workspaceId}] members=${entry.members.length} last-used=${entry.lastUsedAt}`),
+                    ...composites.map((entry) => `${entry.name} [${entry.workspaceId}] state=${entry.state} members=${entry.members.length} last-used=${entry.lastUsedAt}`),
                     instruction,
                 ].join("\n");
                 return {
@@ -2325,20 +2337,13 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 };
             }
             const inventory = await workspaces.listWorkspaces({ workspaceId, mode, root, status, state, staleOnly, offset, limit }, { conversationScopeId, protectedWorkspaceIds });
-            const composites = kind === "workspace"
+            const composites = kind === "workspace" || root !== undefined || mode !== undefined || staleOnly
                 ? []
-                : compositeWorkspaces.list().map((entry) => ({
-                    workspaceId: entry.id,
-                    kind: entry.kind,
-                    name: entry.name,
-                    members: entry.members,
-                    createdAt: entry.createdAt,
-                    lastUsedAt: entry.lastUsedAt,
-                }));
+                : compositeInventory();
             const nextOffset = inventory.page.offset + inventory.page.limit;
             const instruction = [
                 "Resume a selected workspaceId with open_workspace(action=\"open\", workspaceId=...).",
-                "Use close_workspace only after the user chooses cleanup or Composite dissolution; never close inventory entries automatically.",
+                "Use close_workspace only after the user chooses cleanup; Composite close preserves identity, while action=delete dissolves only Composite-owned state. Never close inventory entries automatically.",
                 inventory.page.hasMore
                     ? `More matching workspaces are available; continue with offset=${nextOffset}.`
                     : undefined,
@@ -2356,7 +2361,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     `root=${entry.root}`,
                     `last-used=${entry.lastUsedAt}`,
                 ].filter(Boolean).join(" ")),
-                ...composites.map((entry) => `${entry.name} [${entry.workspaceId}] kind=composite members=${entry.members.length}`),
+                ...composites.map((entry) => `${entry.name} [${entry.workspaceId}] kind=composite state=${entry.state} members=${entry.members.length}`),
                 instruction,
             ].join("\n");
             logToolCall(config, {
@@ -2406,7 +2411,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 composite.members.length > 0
                     ? "Before first work on a member, reopen this Composite Workspace with memberName=<member> and context=auto to receive that member's project bootstrap without creating an implicit current member."
                     : undefined,
-                "Use close_workspace only when the user chooses to dissolve this Composite Workspace; dissolution does not close or clean up member Workspaces.",
+                "close_workspace preserves this Composite identity for later reopen. Use action=delete only when the user explicitly wants to dissolve the Composite relationship; neither operation closes or cleans up member Workspaces.",
             ].join("\n\n");
             const response = {
                 content: [textBlock(instruction)],
@@ -2419,7 +2424,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                         path: composite.name,
                         members: composite.members,
                         instruction,
-                        summary: { members: composite.members.length },
+                        summary: { members: composite.members.length, status: composite.status },
                     },
                 },
                 structuredContent: {
@@ -2427,6 +2432,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     workspaceId: composite.id,
                     kind: "composite",
                     name: composite.name,
+                    status: composite.status,
+                    state: composite.status,
                     members: composite.members,
                     ...(memberContext ? { memberContext } : {}),
                     instruction,
@@ -2921,9 +2928,13 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
     });
     registerAppTool(server, toolNames.closeWorkspace, {
         title: "Close workspace",
-        description: "Close one Workspace after the user chooses cleanup. In v0.8.0, Composite close still dissolves only the Composite identity/member links. Checkout close removes ForgeRelay state but never project files. Managed-worktree-backed Workspaces run the safe finalize lifecycle (hooks, commit, fast-forward integration, cleanup) and require commitMessage. Running processes block ordinary Workspace closure.",
+        description: "Close or explicitly delete one Workspace after the user chooses cleanup. action=close (default) preserves checkout, managed-worktree, and Composite identity for later reopen. action=delete permanently removes ForgeRelay-owned state. Managed-worktree-backed Workspaces still finalize safely when active and require commitMessage. Composite delete dissolves only Composite-owned state and never closes member Workspaces. Checkout project files are never deleted; relayed delete remains unavailable.",
         inputSchema: {
-            workspaceId: z.string().describe("Workspace identifier to close."),
+            workspaceId: z.string().describe("Workspace identifier to close or delete."),
+            action: z
+                .enum(["close", "delete"])
+                .optional()
+                .describe("Defaults to close. close preserves checkout identity, managed-worktree identity, and Composite identity for later reopen; delete removes ForgeRelay-owned state. Composite delete dissolves only the Composite relationship. Active managed worktrees still require safe finalization and commitMessage; checkout project files are never deleted."),
             commitMessage: z
                 .string()
                 .min(1)
@@ -2932,6 +2943,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         },
         outputSchema: resultOutputSchema({
             workspaceId: z.string(),
+            action: z.enum(["close", "delete"]).optional(),
             kind: z.enum(["workspace", "composite"]).optional(),
             mode: z.enum(["checkout", "worktree"]).optional(),
             name: z.string().optional(),
@@ -2940,6 +2952,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 purpose: z.string(),
                 workspaceId: z.string(),
             })).optional(),
+            status: z.enum(["active", "closed"]).optional(),
             dissolved: z.boolean().optional(),
             sourceRoot: z.string().optional(),
             branch: z.string().optional(),
@@ -2951,20 +2964,24 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
         }),
         _meta: {},
         annotations: WRITE_TOOL_ANNOTATIONS,
-    }, async ({ workspaceId, commitMessage }, extra) => {
+    }, async ({ workspaceId, action = "close", commitMessage }, extra) => {
         if (compositeWorkspaces.has(workspaceId)) {
             if (commitMessage !== undefined) {
-                throw new Error("close_workspace commitMessage is not valid when dissolving a Composite Workspace.");
+                throw new Error("close_workspace commitMessage is not valid for a Composite Workspace.");
             }
-            const composite = compositeWorkspaces.dissolve(workspaceId);
+            const composite = action === "delete"
+                ? compositeWorkspaces.dissolve(workspaceId)
+                : compositeWorkspaces.close(workspaceId);
             compositeActivity.forgetComposite(workspaceId);
             workspacePanelStates.delete(workspaceId);
             const result = [
-                `Dissolved Composite Workspace ${composite.name} (${workspaceId}).`,
+                action === "delete"
+                    ? `Deleted Composite Workspace ${composite.name} (${workspaceId}); its Composite relationship and ForgeRelay-owned Composite state were dissolved.`
+                    : `Closed Composite Workspace ${composite.name} (${workspaceId}); its identity and member topology were preserved for later reopen.`,
                 composite.members.length > 0
                     ? `Preserved member Workspaces: ${composite.members.map((member) => `${member.name} [${member.workspaceId}]`).join(", ")}.`
                     : "The Composite Workspace had no members.",
-                "Member Workspace handles, managed worktrees, processes, files, and Workspace Relay routes were not closed or cleaned up.",
+                "Member Workspace handles, managed worktrees, processes, files, and Workspace Relay routes were not closed, finalized, deleted, or otherwise mutated.",
             ].join("\n");
             return {
                 content: [textBlock(result)],
@@ -2972,34 +2989,132 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     tool: toolNames.closeWorkspace,
                     card: {
                         workspaceId,
+                        action,
                         kind: "composite",
                         name: composite.name,
                         members: composite.members,
-                        dissolved: true,
+                        ...(action === "close" ? { status: "closed" } : {}),
+                        dissolved: action === "delete",
                         payload: { content: [textBlock(result)] },
                     },
                 },
                 structuredContent: {
                     result,
                     workspaceId,
+                    action,
                     kind: "composite",
                     name: composite.name,
                     members: composite.members,
-                    dissolved: true,
+                    ...(action === "close" ? { status: "closed" } : {}),
+                    dissolved: action === "delete",
                 },
             };
         }
         if (remoteWorkspaces.has(workspaceId)) {
+            if (action === "delete") {
+                throw new Error("close_workspace action=delete is not available for relayed Workspaces until Workspace Relay lifecycle parity is implemented.");
+            }
             const response = await remoteWorkspaces.closeWorkspace(workspaceId, commitMessage, hostScopeIdFor(extra._meta, extra.sessionId));
             workspacePanelStates.delete(workspaceId);
             return response;
         }
-        const workspace = workspaces.getWorkspace(workspaceId);
+        const session = workspaces.getWorkspaceSession(workspaceId);
+        if (action === "delete" && session.mode === "checkout") {
+            if (commitMessage !== undefined) {
+                throw new Error("close_workspace commitMessage is not valid with action=delete for a checkout Workspace.");
+            }
+            if (processSessions.activeWorkspaceIds().has(session.id)) {
+                throw new Error(`Workspace ${session.id} still owns a running process. Poll, interrupt, or wait for it before deleting this Workspace.`);
+            }
+            const response = await runToolWithHooks(hooks, {
+                signal: extra.signal,
+                tool: toolNames.closeWorkspace,
+                invocation: {
+                    workspaceId: session.id,
+                    workspaceRoot: session.root,
+                    workspaceMode: session.mode,
+                    sourceRoot: session.sourceRoot,
+                },
+                payload: { workspaceId: session.id, action: "delete", mode: session.mode },
+                operation: async () => {
+                    workspaces.deleteWorkspace(session.id);
+                    await reviewCheckpoints.releaseWorkspace(session.id);
+                    const result = `Deleted ForgeRelay Workspace ${session.id}. Physical project files were not removed.`;
+                    return {
+                        content: [textBlock(result)],
+                        _meta: {
+                            tool: toolNames.closeWorkspace,
+                            card: {
+                                workspaceId: session.id,
+                                action: "delete",
+                                mode: "checkout",
+                                payload: { content: [textBlock(result)] },
+                            },
+                        },
+                        structuredContent: {
+                            result,
+                            workspaceId: session.id,
+                            action: "delete",
+                            mode: "checkout",
+                        },
+                    };
+                },
+            });
+            workspacePanelStates.delete(session.id);
+            return response;
+        }
+        if (action === "delete" && session.mode === "worktree" && session.status === "closed") {
+            if (commitMessage !== undefined) {
+                throw new Error("close_workspace commitMessage is not needed when deleting an already-closed managed-worktree Workspace.");
+            }
+            const hookRoot = session.sourceRoot ?? session.root;
+            const response = await runToolWithHooks(hooks, {
+                signal: extra.signal,
+                tool: toolNames.closeWorkspace,
+                invocation: {
+                    workspaceId: session.id,
+                    workspaceRoot: hookRoot,
+                    workspaceMode: session.mode,
+                    sourceRoot: session.sourceRoot,
+                },
+                payload: { workspaceId: session.id, action: "delete", mode: session.mode },
+                operation: async () => {
+                    workspaces.deleteWorkspace(session.id);
+                    await reviewCheckpoints.releaseWorkspace(session.id);
+                    const result = `Deleted closed managed-worktree Workspace ${session.id}. Its already-removed worktree backing was not recreated.`;
+                    return {
+                        content: [textBlock(result)],
+                        _meta: {
+                            tool: toolNames.closeWorkspace,
+                            card: {
+                                workspaceId: session.id,
+                                action: "delete",
+                                mode: "worktree",
+                                sourceRoot: session.sourceRoot,
+                                targetBranch: session.targetBranch,
+                                payload: { content: [textBlock(result)] },
+                            },
+                        },
+                        structuredContent: {
+                            result,
+                            workspaceId: session.id,
+                            action: "delete",
+                            mode: "worktree",
+                            sourceRoot: session.sourceRoot,
+                            targetBranch: session.targetBranch,
+                        },
+                    };
+                },
+            });
+            workspacePanelStates.delete(session.id);
+            return response;
+        }
+        const workspace = workspaces.getWorkspace(session.id);
         const response = await runToolWithHooks(hooks, {
             signal: extra.signal,
             tool: toolNames.closeWorkspace,
             invocation: workspaceHookInvocation(workspace),
-            payload: { workspaceId, commitMessage, mode: workspace.mode },
+            payload: { workspaceId: workspace.id, action, commitMessage, mode: workspace.mode },
             afterCwd: (response) => "sourceRoot" in response.structuredContent &&
                 typeof response.structuredContent.sourceRoot === "string"
                 ? response.structuredContent.sourceRoot
@@ -3007,7 +3122,7 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
             operation: async () => {
                 if (workspace.mode === "worktree") {
                     if (!commitMessage) {
-                        throw new Error(`Managed-worktree-backed workspace ${workspaceId} requires commitMessage when closing.`);
+                        throw new Error(`Managed-worktree-backed Workspace ${workspace.id} requires commitMessage when ${action === "delete" ? "deleting active work" : "closing"}.`);
                     }
                     const physicalWorkspaceIds = workspaces.workspaceIdsForPhysicalWorkspace(workspace);
                     const busyWorkspaceIds = physicalWorkspaceIds
@@ -3019,14 +3134,19 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                     const retirement = await codeIntelligence.retireWorkspaceRoot(workspace.root);
                     let closed;
                     try {
-                        closed = await workspaces.closeWorktree(workspaceId, commitMessage);
+                        closed = await workspaces.closeWorktree(workspace.id, commitMessage);
                     }
                     finally {
                         codeIntelligence.restoreWorkspaceRoot(retirement.root);
                     }
                     await Promise.all(physicalWorkspaceIds.map((id) => reviewCheckpoints.releaseWorkspace(id)));
+                    if (action === "delete") {
+                        workspaces.deleteWorkspace(workspace.id);
+                    }
                     const result = [
-                        `Closed managed-worktree-backed workspace ${workspaceId}.`,
+                        action === "delete"
+                            ? `Safely finalized and deleted managed-worktree Workspace ${workspace.id}.`
+                            : `Closed managed-worktree-backed Workspace ${workspace.id}; its identity was preserved for later reopen.`,
                         `Merged ${closed.branch} into ${closed.targetBranch} by fast-forward.`,
                         `Source checkout: ${closed.sourceRoot}`,
                         `Commit: ${closed.commitSha}`,
@@ -3046,7 +3166,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                         _meta: {
                             tool: toolNames.closeWorkspace,
                             card: {
-                                workspaceId,
+                                workspaceId: workspace.id,
+                                action,
                                 mode: "worktree",
                                 sourceRoot: closed.sourceRoot,
                                 branch: closed.branch,
@@ -3060,7 +3181,8 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                         },
                         structuredContent: {
                             result,
-                            workspaceId,
+                            workspaceId: workspace.id,
+                            action,
                             mode: "worktree",
                             sourceRoot: closed.sourceRoot,
                             branch: closed.branch,
@@ -3075,27 +3197,34 @@ export function createMcpServer(config, workspaces, reviewCheckpoints, processSe
                 if (commitMessage !== undefined) {
                     throw new Error("close_workspace commitMessage is only valid for managed-worktree-backed workspaces.");
                 }
-                if (processSessions.activeWorkspaceIds().has(workspaceId)) {
-                    throw new Error(`Workspace ${workspaceId} still owns a running process. Poll, interrupt, or wait for it before closing this workspace.`);
+                const checkoutWorkspaceId = workspace.id;
+                if (processSessions.activeWorkspaceIds().has(checkoutWorkspaceId)) {
+                    throw new Error(`Workspace ${checkoutWorkspaceId} still owns a running process. Poll, interrupt, or wait for it before closing this workspace.`);
                 }
-                workspaces.closeWorkspace(workspaceId);
-                await reviewCheckpoints.releaseWorkspace(workspaceId);
-                const result = `Closed checkout-backed workspace ${workspaceId}. Physical project files were not removed.`;
+                workspaces.closeWorkspace(checkoutWorkspaceId);
+                await reviewCheckpoints.releaseWorkspace(checkoutWorkspaceId);
+                const result = `Closed checkout-backed Workspace ${checkoutWorkspaceId}; its ForgeRelay identity was preserved for later reopen. Physical project files were not removed.`;
                 return {
                     content: [textBlock(result)],
                     _meta: {
                         tool: toolNames.closeWorkspace,
                         card: {
-                            workspaceId,
+                            workspaceId: checkoutWorkspaceId,
+                            action: "close",
                             mode: "checkout",
                             payload: { content: [textBlock(result)] },
                         },
                     },
-                    structuredContent: { result, workspaceId, mode: "checkout" },
+                    structuredContent: {
+                        result,
+                        workspaceId: checkoutWorkspaceId,
+                        action: "close",
+                        mode: "checkout",
+                    },
                 };
             },
         });
-        workspacePanelStates.delete(workspaceId);
+        workspacePanelStates.delete(workspace.id);
         return response;
     });
     registerAppTool(server, toolNames.read, {