authoravatarclover caruso<git@paperclover.net>2026-10-13 16:11:38-07:00
committeravatarclover caruso<git@paperclover.net>2026-11-13 16:28:31-08:00
log0a3a0718013495927cf596de79e0763634a660c9
tree1097e906337200ff364e891631ce2a5d3fb59188
parente2e73d63e934d5f61454e9f1d6e4d1649af89edc
signature Signed by SSH key SHA256:cOKiuRFOeSRxne6EWgHtdQQSlBxjOXm2hOCFnCdLQbQ

feat(workspaces): archive verified completed work before collection

Clover wants settled workspace directories retained until their linked PRs merge, with archival releasing them for collection. Before reading deletion references, ws gc asks T3 Code to verify completion and perform guarded archival for each prepared registered directory. All quiet/settled/strict-merge eligibility and resume guards remain server-owned. The existing collector still enforces setup, all-chat, editor, live-cwd, grace, and fresh-read protections. RPC errors or unknown results pause deletion and reset grace; dry runs never request archival. Verified the caller with a stub for only the new archiveCompleted RPC against the real isolated V2 CLI/JJ/APFS/pnpm flow: failed and malformed reads preserve eligible folders, resumed chats block deletion even after a successful reply, and archived folders collect only after grace. Backend strict merge and race tests live with that API implementation. Assisted-by: gpt-6.1-sol

3 files changed, 78 insertions(+), 2 deletions(-)

users/clover/packages/workspaces/README.md+4-1
......@@ -38,6 +38,7 @@ reserve empty folder → create and open T3 thread
3838 → release waiting Claude/Codex hooks
3939
4040Every 30 seconds:
41 T3 verifies settled, quiet chats with linked PRs all merged → archive chats
4142 unfinished setup / unarchived T3 chat / running work / VS Code / live shell cwd
4243 → keep workspace, reset grace
4344 no references for ≥60 seconds, with a fresh check immediately before removal
......@@ -48,7 +49,9 @@ Every 30 seconds:
4849
4950Settling a chat keeps its workspace directory. Cleanup begins only after every
5051chat using the directory is archived or deleted and no work is running. Archival
51releases the directory for cleanup; settling does not.
52releases the directory for cleanup; settling does not. Automatic archival uses
53T3 Code's guarded merge check and retains chats with open, closed, or missing PRs.
54An unavailable merge check pauses cleanup. `ws gc --dry-run` never archives chats.
5255
5356Only registered workspaces under `~/workspaces` are collected. JJ retains
5457snapshotted changes; ignored files are deleted with the directory. Closing T3
users/clover/packages/workspaces/workspaces.mjs+16-1
......@@ -256,7 +256,7 @@ export async function t3() {
256256 );
257257 }
258258
259 return { snapshot, dispatch, environment, app };
259 return { snapshot, dispatch, rpc, environment, app };
260260}
261261
262262function dependencyKey(directory) {
......@@ -805,6 +805,21 @@ export async function main(args) {
805805 );
806806 try {
807807 const client = await t3();
808 if (argument !== "--dry-run") {
809 for (const entry of entries) {
810 const record = JSON.parse(fs.readFileSync(path.join(records, entry)));
811 if (!record.threadId || !record.prepared) continue;
812 const result = await client.rpc("managedWorkspaces.archiveCompleted", {
813 workspacePath: workspace(entry.slice(0, -5)),
814 });
815 if (
816 !Array.isArray(result?.archivedThreadIds) ||
817 !result.archivedThreadIds.every((id) => typeof id === "string")
818 ) {
819 throw new Error("T3 Code returned an unknown archive result. Cleanup is paused.");
820 }
821 }
822 }
808823 const refs = await references(client);
809824 for (const entry of entries) {
810825 const id = entry.slice(0, -5);
users/clover/packages/workspaces/workspaces.test.mjs+58
......@@ -134,6 +134,25 @@ test("workspace lifecycle through nightly, JJ, APFS, and reference sockets", {
134134 );
135135 const { main, t3 } = await import("./workspaces.mjs");
136136 const client = await t3();
137 const archiveRequests = [];
138 let archiveHandler = () => ({ archivedThreadIds: [] });
139 const WebSocket = globalThis.WebSocket;
140 mock.method(globalThis, "WebSocket", function (...args) {
141 const socket = new WebSocket(...args);
142 const send = socket.send.bind(socket);
143 socket.send = (data) => {
144 const request = JSON.parse(String(data).trim());
145 if (request.tag !== "managedWorkspaces.archiveCompleted") return send(data);
146 archiveRequests.push(request.payload);
147 Promise.resolve().then(() => archiveHandler(request.payload)).then(
148 (value) => ({ _tag: "Success", value }),
149 (error) => ({ _tag: "Failure", cause: error.message }),
150 ).then((exit) => socket.onmessage(new MessageEvent("message", {
151 data: JSON.stringify({ _tag: "Exit", requestId: request.id, exit }) + "\n",
152 })));
153 };
154 return socket;
155 });
137156 const project = (await client.snapshot()).projects[0];
138157 await client.dispatch({
139158 type: "project.update",
......@@ -603,8 +622,21 @@ exec "$WORKSPACE_TEST_PNPM" "$@"
603622 );
604623 assert.equal(readRecord().idleSince, null);
605624 referenceMock.mock.restore();
625 archiveHandler = () => { throw new Error("PR read unavailable"); };
626 age();
627 await assert.rejects(main(["gc"]), /PR read unavailable/);
628 assert.ok(fs.existsSync(first), "merge read failure stops eligible cleanup");
629 assert.equal(readRecord().idleSince, null);
630 archiveHandler = () => ({ archivedThreadIds: "unknown" });
606631 age();
632 await assert.rejects(main(["gc"]), /unknown archive result/);
633 assert.ok(fs.existsSync(first), "unknown merge response stops cleanup");
634 assert.equal(readRecord().idleSince, null);
635 archiveHandler = () => ({ archivedThreadIds: [] });
636 age();
637 const requestsBeforeDryRun = archiveRequests.length;
607638 await main(["gc", "--dry-run"]);
639 assert.equal(archiveRequests.length, requestsBeforeDryRun, "dry run never requests archival");
608640 assert.ok(fs.existsSync(first), "dry run never removes a workspace");
609641 fs.writeFileSync(
610642 path.join(first, "saved.txt"),
......@@ -648,6 +680,32 @@ exec "$WORKSPACE_TEST_PNPM" "$@"
648680 await main(["gc"]);
649681 assert.ok(fs.existsSync(first), "a settled replacement chat keeps its workspace");
650682 assert.equal(readRecord().idleSince, null);
683 archiveHandler = async ({ workspacePath }) => {
684 if (workspacePath !== first) return { archivedThreadIds: [] };
685 await client.dispatch({ type: "thread.unsettle", threadId: freshRecord.threadId, reason: "user" });
686 return { archivedThreadIds: [freshRecord.threadId] };
687 };
688 age();
689 await main(["gc"]);
690 assert.ok(fs.existsSync(first), "a resumed chat keeps its workspace after the merge check");
691 assert.equal(readRecord().idleSince, null);
692 await client.dispatch({ type: "thread.settle", threadId: freshRecord.threadId });
693 archiveHandler = async ({ workspacePath }) => {
694 if (workspacePath !== first) return { archivedThreadIds: [] };
695 await client.dispatch({ type: "thread.archive", threadId: freshRecord.threadId });
696 return { archivedThreadIds: [freshRecord.threadId] };
697 };
698 await main(["gc"]);
699 assert.ok(fs.existsSync(first), "verified merge archival starts the deletion grace period");
700 assert.ok(readRecord().idleSince > Date.now() - 5000);
701 archiveHandler = () => ({ archivedThreadIds: [] });
702 age();
703 await main(["gc"]);
704 assert.equal(fs.existsSync(first), false, "merged archived workspace is collected after grace");
705 assert.ok(archiveRequests.some(({ workspacePath }) => workspacePath === first));
706 assert.ok(archiveRequests.every(({ workspacePath }) =>
707 path.dirname(workspacePath) === path.join(directory, "workspaces")
708 ), "only registered managed folders are checked");
651709 const secondRecord = JSON.parse(
652710 fs.readFileSync(
653711 path.join(directory, ".local/state/workspaces/workspaces/second.json"),