Skip to content

Node-based terminal manager for AI coding agents — tmux-backed terminals and parallel agent sessions as draggable nodes on an infinite pan/zoom canvas. macOS, Linux, and a browser Server Edition.

fix(workspace): deleting a folder project kept in app data removes its app-data side files

review084806dfb483
diff --git a/src/core/workspace-store.folder-data.test.ts b/src/core/workspace-store.folder-data.test.ts
index 52cce4143..9aa7d8d89 100644
--- a/src/core/workspace-store.folder-data.test.ts
+++ b/src/core/workspace-store.folder-data.test.ts
@@ -457,3 +457,32 @@ describe('a move into a folder never loses the canvas', () => {
expect(ids(loaded.nodes)).toEqual(['term-1'])
})
})
+
+describe('deleting a folder project kept in app data', () => {
+ it('removes its data file and its app-data side files, and leaves the folder alone', async () => {
+ const store = new WorkspaceStore()
+ await store.save(ws([project()]))
+ await store.writeProjectSettings('project-p1', { terminal: { shell: '/bin/fish' } })
+ const side = path.join(userData, 'project-files', 'project-p1')
+ await fs.writeFile(path.join(side, '.nodeterm', 'board-log.jsonl'), '{}\n')
+ await fs.writeFile(path.join(folder, 'README.md'), 'mine')
+
+ await store.save(ws([]))
+
+ expect(await exists(dataFile('project-p1'))).toBe(false)
+ expect(await exists(side)).toBe(false)
+ expect(await fs.readdir(folder)).toEqual(['README.md'])
+ })
+
+ it('a project that only moved back into its folder keeps its app-data board log', async () => {
+ const store = new WorkspaceStore()
+ await store.save(ws([project()]))
+ const log = path.join(userData, 'project-files', 'project-p1', '.nodeterm', 'board-log.jsonl')
+ await fs.mkdir(path.dirname(log), { recursive: true })
+ await fs.writeFile(log, '{}\n')
+
+ await store.save(ws([project({ storeInAppData: undefined })]))
+ expect(await exists(dataFile('project-p1'))).toBe(false)
+ expect(await exists(log)).toBe(true)
+ })
+})
diff --git a/src/core/workspace-store.ts b/src/core/workspace-store.ts
index 6a78774c3..17222d56f 100644
--- a/src/core/workspace-store.ts
+++ b/src/core/workspace-store.ts
@@ -1831,6 +1831,13 @@ export class WorkspaceStore {
// A project that only moved its canvas keeps its rev: it continues in the new location, and
// resetting it would send the folder's next write out as rev 1 over the rev N just written.
if (!nextById.has(e.id)) this.revs.delete(e.id)
+ // A DELETED folder project kept in app data takes its app-data side files with it (settings,
+ // board log: `appDataProjectRoot`), as a folder ref's would go with its folder if the user
+ // deleted that. One that only moved back into its folder keeps them: its board log history
+ // stays there rather than vanish with a move.
+ if (!nextById.has(e.id) && isFolderDataRef(e)) {
+ await fs.rm(appDataProjectRoot(e.id), { recursive: true, force: true }).catch(() => undefined)
+ }
// A folder-data-ref that moved back into its folder: its app-data settings were carried into
// the folder by `prepareFolderStorage`. Removed only once the folder demonstrably has them —
// a move that skipped the carry must not lose the project's settings.
diff --git a/src/renderer/lib/projectCloseSessions.test.ts b/src/renderer/lib/projectCloseSessions.test.ts
index 774a149f4..a3a068170 100644
--- a/src/renderer/lib/projectCloseSessions.test.ts
+++ b/src/renderer/lib/projectCloseSessions.test.ts
@@ -88,7 +88,7 @@ describe('deleteConfirmCopy', () => {
it('a project stored in app data: says the canvas goes with it (#1145)', () => {
const c = deleteConfirmCopy({ ...project({ nodes: [{ id: 't1' }] }), storeInAppData: true })
- expect(c.message).toContain('the canvas is: it was stored in app data')
+ expect(c.message).toContain('the canvas, its project settings and its board log are: they were stored in app data')
expect(c.message).not.toContain('.nodeterm/project.json')
})
diff --git a/src/renderer/lib/projectCloseSessions.ts b/src/renderer/lib/projectCloseSessions.ts
index bbf426549..da6a5b141 100644
--- a/src/renderer/lib/projectCloseSessions.ts
+++ b/src/renderer/lib/projectCloseSessions.ts
@@ -114,9 +114,10 @@ export function deleteConfirmCopy(project: ProjectLike): DeleteConfirmCopy {
? `ends its ${n} terminal session${plural(n)} on ${sshHostLabel(project)} and `
: `ends its ${n} terminal session${plural(n)} and `
const where = project.ssh ? 'on the server' : 'on disk'
- // A project stored in app data (#1145) has no copy in its folder: removing it deletes the canvas.
+ // A project stored in app data (#1145) has no copy in its folder: removing it deletes the canvas
+ // and its app-data side files (WorkspaceStore's data-file sweep).
const tail = project.storeInAppData && !project.ssh
- ? `The folder ${where} is not deleted, but the canvas is: it was stored in app data, not in the folder.`
+ ? `The folder ${where} is not deleted, but the canvas, its project settings and its board log are: they were stored in app data, not in the folder.`
: `The folder ${where} (including .nodeterm/project.json) is not deleted.`
return {
message: `Delete “${name}”? This ${sessions}removes the project from nodeterm. ${tail}`,