@grackle-ai/server 0.46.0 → 0.47.1

package/dist/utils/system-context.js

@@ -6,13 +6,13 @@ export function buildTaskSystemContext(title, description, notes, canDecompose)
         notes ? `## Notes (from previous attempt or user feedback)\n${notes}` : "",
         `## Grackle Tools (MCP)`,
         `You have a "grackle" MCP server with tools for coordinating with other agents:`,
-        `- **mcp__grackle__finding_post**: Share discoveries (architecture decisions, bugs, patterns) with other agents working on this project. Parameters: projectId (string — injected automatically), title (string, required), content (string, optional), category (optional: architecture|api|bug|decision|dependency|pattern|general), tags (optional: string[]).`,
-        `- **mcp__grackle__finding_list**: Query findings posted by other agents. Parameters: projectId (string — injected automatically), category (optional), tag (optional), limit (optional). Findings from previous tasks are also in your system context above.`,
+        `- **mcp__grackle__finding_post**: Share discoveries (architecture decisions, bugs, patterns) with other agents working on this workspace. Parameters: workspaceId (string — injected automatically), title (string, required), content (string, optional), category (optional: architecture|api|bug|decision|dependency|pattern|general), tags (optional: string[]).`,
+        `- **mcp__grackle__finding_list**: Query findings posted by other agents. Parameters: workspaceId (string — injected automatically), category (optional), tag (optional), limit (optional). Findings from previous tasks are also in your system context above.`,
     ];
     if (canDecompose) {
-        sections.push(`- **mcp__grackle__task_create**: Create a new task in the project. Use this when work is too large or complex for you to complete alone. Parameters: projectId (string — injected automatically), title (string, required), description (string, optional — be specific about what to do and what "done" looks like).`);
+        sections.push(`- **mcp__grackle__task_create**: Create a new task in the workspace. Use this when work is too large or complex for you to complete alone. Parameters: workspaceId (string — injected automatically), title (string, required), description (string, optional — be specific about what to do and what "done" looks like).`);
     }
-    sections.push(`## Completion Checklist`, `When you have finished implementing the task, you MUST complete ALL steps below in order. Do NOT stop early or go to "waiting for input" until every step is done.`, ``, `### Phase 1: Implement & Test`, `1. **Implement** the task requirements.`, `2. **Write tests**: Write unit tests, integration tests, or E2E specs as appropriate. Every implementation MUST include tests unless the change is purely cosmetic or untestable (state why if skipping).`, `3. **Build**: Run the project's build command and fix any errors.`, `4. **Run tests**: Run relevant tests and ensure they pass.`, `5. **Manual test**: If the change affects UI, visually verify. If it affects CLI or API, run the commands manually. State explicitly if skipping and why.`, ``, `### Phase 2: Create PR`, `6. **Sync with main**: Fetch and merge the main branch. If merge conflicts arise, resolve them, stage, and commit the merge. NEVER rebase.`, `7. **Rebuild after merge**: If the merge brought in new commits, rebuild to catch integration conflicts.`, `8. **Commit**: Stage your changed files and create a descriptive git commit. Use a conventional commit message (e.g., \`fix: ...\`, \`feat: ...\`).`, `9. **Push**: Push your branch to the remote.`, `10. **Create PR**: Create a pull request that links back to the issue (e.g., "Closes #ISSUE").`, ``, `### Phase 3: PR Readiness (you MUST complete this — do NOT skip)`, `After creating the PR, you must ensure it is ready to merge.`, ``, `11. **Check for merge conflicts**: Verify the PR has no merge conflicts. If it does, fetch and merge the main branch, resolve conflicts, rebuild, commit, and push.`, `12. **Wait for CI**: Wait for all CI checks to complete. If any check fails, read the logs, fix the issue, commit, push, and repeat.`, `13. **Address code review comments**: Check for automated code review comments. For each unresolved comment: read the suggestion, fix the code or dismiss with an explanation, reply to the comment, and resolve the thread. After fixing, commit, push, and check again. Repeat until all review threads are resolved.`, `14. **Post finding**: Use mcp__grackle__post_finding to summarize what you did and any key decisions.`, ``, `IMPORTANT: The PR is the deliverable, but a PR with failing CI or unresolved review comments is NOT done. You MUST complete Phase 3. Do NOT go to "waiting for input" until CI is green AND all review threads are resolved.`);
+    sections.push(`## Completion Checklist`, `When you have finished implementing the task, you MUST complete ALL steps below in order. Do NOT stop early or go to "waiting for input" until every step is done.`, ``, `### Phase 1: Implement & Test`, `1. **Implement** the task requirements.`, `2. **Write tests**: Write unit tests, integration tests, or E2E specs as appropriate. Every implementation MUST include tests unless the change is purely cosmetic or untestable (state why if skipping).`, `3. **Build**: Run the repository's build command and fix any errors.`, `4. **Run tests**: Run relevant tests and ensure they pass.`, `5. **Manual test**: If the change affects UI, visually verify. If it affects CLI or API, run the commands manually. State explicitly if skipping and why.`, ``, `### Phase 2: Create PR`, `6. **Sync with main**: Fetch and merge the main branch. If merge conflicts arise, resolve them, stage, and commit the merge. NEVER rebase.`, `7. **Rebuild after merge**: If the merge brought in new commits, rebuild to catch integration conflicts.`, `8. **Commit**: Stage your changed files and create a descriptive git commit. Use a conventional commit message (e.g., \`fix: ...\`, \`feat: ...\`).`, `9. **Push**: Push your branch to the remote.`, `10. **Create PR**: Create a pull request that links back to the issue (e.g., "Closes #ISSUE").`, ``, `### Phase 3: PR Readiness (you MUST complete this — do NOT skip)`, `After creating the PR, you must ensure it is ready to merge.`, ``, `11. **Check for merge conflicts**: Verify the PR has no merge conflicts. If it does, fetch and merge the main branch, resolve conflicts, rebuild, commit, and push.`, `12. **Wait for CI**: Wait for all CI checks to complete. If any check fails, read the logs, fix the issue, commit, push, and repeat.`, `13. **Address code review comments**: Check for automated code review comments. For each unresolved comment: read the suggestion, fix the code or dismiss with an explanation, reply to the comment, and resolve the thread. After fixing, commit, push, and check again. Repeat until all review threads are resolved.`, `14. **Post finding**: Use mcp__grackle__post_finding to summarize what you did and any key decisions.`, ``, `IMPORTANT: The PR is the deliverable, but a PR with failing CI or unresolved review comments is NOT done. You MUST complete Phase 3. Do NOT go to "waiting for input" until CI is green AND all review threads are resolved.`);
     return sections.filter(Boolean).join("\n\n");
 }
 //# sourceMappingURL=system-context.js.map

package/dist/utils/system-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"system-context.js","sourceRoot":"","sources":["../../src/utils/system-context.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,MAAM,UAAU,sBAAsB,CAAC,KAAa,EAAE,WAAmB,EAAE,KAAa,EAAE,YAAsB;IAC9G,MAAM,QAAQ,GAAa;QACzB,YAAY,KAAK,EAAE;QACnB,WAAW;QACX,KAAK,CAAC,CAAC,CAAC,sDAAsD,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;QAC1E,wBAAwB;QACxB,gFAAgF;QAChF,kWAAkW;QAClW,8PAA8P;KAC/P,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAI,CACX,uTAAuT,CACxT,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAI,CACX,yBAAyB,EACzB,oKAAoK,EACpK,EAAE,EACF,+BAA+B,EAC/B,yCAAyC,EACzC,2MAA2M,EAC3M,mEAAmE,EACnE,4DAA4D,EAC5D,2JAA2J,EAC3J,EAAE,EACF,wBAAwB,EACxB,4IAA4I,EAC5I,0GAA0G,EAC1G,qJAAqJ,EACrJ,8CAA8C,EAC9C,gGAAgG,EAChG,EAAE,EACF,kEAAkE,EAClE,8DAA8D,EAC9D,EAAE,EACF,qKAAqK,EACrK,sIAAsI,EACtI,yTAAyT,EACzT,uGAAuG,EACvG,EAAE,EACF,8NAA8N,CAC/N,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"system-context.js","sourceRoot":"","sources":["../../src/utils/system-context.ts"],"names":[],"mappings":"AAAA,iFAAiF;AACjF,MAAM,UAAU,sBAAsB,CAAC,KAAa,EAAE,WAAmB,EAAE,KAAa,EAAE,YAAsB;IAC9G,MAAM,QAAQ,GAAa;QACzB,YAAY,KAAK,EAAE;QACnB,WAAW;QACX,KAAK,CAAC,CAAC,CAAC,sDAAsD,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;QAC1E,wBAAwB;QACxB,gFAAgF;QAChF,sWAAsW;QACtW,gQAAgQ;KACjQ,CAAC;IAEF,IAAI,YAAY,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAI,CACX,2TAA2T,CAC5T,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAI,CACX,yBAAyB,EACzB,oKAAoK,EACpK,EAAE,EACF,+BAA+B,EAC/B,yCAAyC,EACzC,2MAA2M,EAC3M,sEAAsE,EACtE,4DAA4D,EAC5D,2JAA2J,EAC3J,EAAE,EACF,wBAAwB,EACxB,4IAA4I,EAC5I,0GAA0G,EAC1G,qJAAqJ,EACrJ,8CAA8C,EAC9C,gGAAgG,EAChG,EAAE,EACF,kEAAkE,EAClE,8DAA8D,EAC9D,EAAE,EACF,qKAAqK,EACrK,sIAAsI,EACtI,yTAAyT,EACzT,uGAAuG,EACvG,EAAE,EACF,8NAA8N,CAC/N,CAAC;IAEF,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC/C,CAAC"}

package/dist/workspace-store.d.ts

@@ -0,0 +1,26 @@
+import { type WorkspaceRow } from "./schema.js";
+export type { WorkspaceRow };
+/** Insert a new workspace record. */
+export declare function createWorkspace(id: string, name: string, description: string, repoUrl: string, defaultEnvironmentId: string, useWorktrees?: boolean, worktreeBasePath?: string, defaultPersonaId?: string): void;
+/** Retrieve a single workspace by ID. */
+export declare function getWorkspace(id: string): WorkspaceRow | undefined;
+/** Return all active workspaces, newest first. */
+export declare function listWorkspaces(): WorkspaceRow[];
+/** Mark a workspace as archived. */
+export declare function archiveWorkspace(id: string): void;
+/** Partial-update fields for a workspace. Undefined means "no change"; empty string means "clear". */
+export interface UpdateWorkspaceFields {
+    name?: string;
+    description?: string;
+    repoUrl?: string;
+    defaultEnvironmentId?: string;
+    /** When false, agents work directly in the main checkout instead of creating a worktree. */
+    useWorktrees?: boolean;
+    /** Custom base path for worktrees (e.g. /workspaces/my-repo). Empty means use default. */
+    worktreeBasePath?: string;
+    /** Default persona for tasks in this workspace. */
+    defaultPersonaId?: string;
+}
+/** Update one or more fields on an existing workspace. Returns the updated row, or undefined if not found. */
+export declare function updateWorkspace(id: string, fields: UpdateWorkspaceFields): WorkspaceRow | undefined;
+//# sourceMappingURL=workspace-store.d.ts.map

package/dist/workspace-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-store.d.ts","sourceRoot":"","sources":["../src/workspace-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAG5D,YAAY,EAAE,YAAY,EAAE,CAAC;AAE7B,qCAAqC;AACrC,wBAAgB,eAAe,CAC7B,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,oBAAoB,EAAE,MAAM,EAC5B,YAAY,GAAE,OAAc,EAC5B,gBAAgB,GAAE,MAAW,EAC7B,gBAAgB,GAAE,MAAW,GAC5B,IAAI,CAWN;AAED,yCAAyC;AACzC,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAEjE;AAED,kDAAkD;AAClD,wBAAgB,cAAc,IAAI,YAAY,EAAE,CAK/C;AAED,oCAAoC;AACpC,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAKjD;AAED,sGAAsG;AACtG,MAAM,WAAW,qBAAqB;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,4FAA4F;IAC5F,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0FAA0F;IAC1F,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,8GAA8G;AAC9G,wBAAgB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,qBAAqB,GAAG,YAAY,GAAG,SAAS,CAyBnG"}

package/dist/{project-store.js → workspace-store.js}

@@ -1,9 +1,9 @@
 import db from "./db.js";
-import { projects } from "./schema.js";
+import { workspaces } from "./schema.js";
 import { eq, desc, sql } from "drizzle-orm";
-/** Insert a new project record. */
-export function createProject(id, name, description, repoUrl, defaultEnvironmentId, useWorktrees = true, worktreeBasePath = "", defaultPersonaId = "") {
-    db.insert(projects).values({
+/** Insert a new workspace record. */
+export function createWorkspace(id, name, description, repoUrl, defaultEnvironmentId, useWorktrees = true, worktreeBasePath = "", defaultPersonaId = "") {
+    db.insert(workspaces).values({
         id,
         name,
         description,
@@ -14,26 +14,26 @@ export function createProject(id, name, description, repoUrl, defaultEnvironment
         defaultPersonaId,
     }).run();
 }
-/** Retrieve a single project by ID. */
-export function getProject(id) {
-    return db.select().from(projects).where(eq(projects.id, id)).get();
+/** Retrieve a single workspace by ID. */
+export function getWorkspace(id) {
+    return db.select().from(workspaces).where(eq(workspaces.id, id)).get();
 }
-/** Return all active projects, newest first. */
-export function listProjects() {
-    return db.select().from(projects)
-        .where(eq(projects.status, "active"))
-        .orderBy(desc(projects.createdAt))
+/** Return all active workspaces, newest first. */
+export function listWorkspaces() {
+    return db.select().from(workspaces)
+        .where(eq(workspaces.status, "active"))
+        .orderBy(desc(workspaces.createdAt))
         .all();
 }
-/** Mark a project as archived. */
-export function archiveProject(id) {
-    db.update(projects)
+/** Mark a workspace as archived. */
+export function archiveWorkspace(id) {
+    db.update(workspaces)
         .set({ status: "archived", updatedAt: sql `datetime('now')` })
-        .where(eq(projects.id, id))
+        .where(eq(workspaces.id, id))
         .run();
 }
-/** Update one or more fields on an existing project. Returns the updated row, or undefined if not found. */
-export function updateProject(id, fields) {
+/** Update one or more fields on an existing workspace. Returns the updated row, or undefined if not found. */
+export function updateWorkspace(id, fields) {
     const sets = { updatedAt: sql `datetime('now')` };
     if (fields.name !== undefined) {
         sets.name = fields.name;
@@ -56,7 +56,7 @@ export function updateProject(id, fields) {
     if (fields.defaultPersonaId !== undefined) {
         sets.defaultPersonaId = fields.defaultPersonaId;
     }
-    db.update(projects).set(sets).where(eq(projects.id, id)).run();
-    return getProject(id);
+    db.update(workspaces).set(sets).where(eq(workspaces.id, id)).run();
+    return getWorkspace(id);
 }
-//# sourceMappingURL=project-store.js.map
+//# sourceMappingURL=workspace-store.js.map

package/dist/workspace-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-store.js","sourceRoot":"","sources":["../src/workspace-store.ts"],"names":[],"mappings":"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"}

package/dist/ws-bridge.js

@@ -8,7 +8,7 @@ import { reconnectOrProvision, } from "@grackle-ai/adapter-sdk";
 import * as streamHub from "./stream-hub.js";
 import * as tokenBroker from "./token-broker.js";
 import * as credentialProviders from "./credential-providers.js";
-import * as projectStore from "./project-store.js";
+import * as workspaceStore from "./workspace-store.js";
 import * as taskStore from "./task-store.js";
 import * as findingStore from "./finding-store.js";
 import * as personaStore from "./persona-store.js";
@@ -174,12 +174,12 @@ async function autoProvisionEnvironment(ws, environmentId, env, logContext) {
  * string for failures that need the caller to surface to the client.
  */
 async function startTaskSession(ws, task, options) {
-    const project = task.projectId ? projectStore.getProject(task.projectId) : undefined;
-    if (task.projectId && !project) {
-        logger.warn({ taskId: task.id }, "startTaskSession failed: project not found");
-        return `Project not found: ${task.projectId}`;
+    const workspace = task.workspaceId ? workspaceStore.getWorkspace(task.workspaceId) : undefined;
+    if (task.workspaceId && !workspace) {
+        logger.warn({ taskId: task.id }, "startTaskSession failed: workspace not found");
+        return `Workspace not found: ${task.workspaceId}`;
     }
-    const environmentId = options?.environmentId || project?.defaultEnvironmentId || "";
+    const environmentId = options?.environmentId || workspace?.defaultEnvironmentId || "";
     const env = envRegistry.getEnvironment(environmentId);
     if (!env) {
         logger.warn({ taskId: task.id, environmentId }, "startTaskSession failed: environment not found");
@@ -191,10 +191,10 @@ async function startTaskSession(ws, task, options) {
     if (!conn) {
         return undefined;
     }
-    // Resolve persona via cascade (request → task → project → app default)
+    // Resolve persona via cascade (request → task → workspace → app default)
     let resolved;
     try {
-        resolved = resolvePersona(options?.personaId || "", task.defaultPersonaId, project?.defaultPersonaId || "");
+        resolved = resolvePersona(options?.personaId || "", task.defaultPersonaId, workspace?.defaultPersonaId || "");
     }
     catch (err) {
         return err.message;
@@ -211,7 +211,7 @@ async function startTaskSession(ws, task, options) {
     emit("task.started", {
         taskId: freshTask.id,
         sessionId,
-        projectId: freshTask.projectId || "",
+        workspaceId: freshTask.workspaceId || "",
     });
     // Re-push stored tokens + provider credentials (scoped to runtime) so they're fresh for this session.
     // For local envs, skip file tokens — the PowerLine is on the same machine.
@@ -233,8 +233,8 @@ async function startTaskSession(ws, task, options) {
     const mcpPort = parseInt(process.env.GRACKLE_MCP_PORT || String(DEFAULT_MCP_PORT), 10);
     const mcpDialHost = toDialableHost(process.env.GRACKLE_HOST || "127.0.0.1");
     const mcpUrl = `http://${mcpDialHost}:${mcpPort}/mcp`;
-    const mcpToken = createScopedToken({ sub: freshTask.id, pid: freshTask.projectId || "", per: resolved.personaId, sid: sessionId }, loadOrCreateApiKey());
-    const useWorktrees = project?.useWorktrees ?? false;
+    const mcpToken = createScopedToken({ sub: freshTask.id, pid: freshTask.workspaceId || "", per: resolved.personaId, sid: sessionId }, loadOrCreateApiKey());
+    const useWorktrees = workspace?.useWorktrees ?? false;
     const powerlineReq = create(powerline.SpawnRequestSchema, {
         sessionId,
         runtime,
@@ -242,11 +242,12 @@ async function startTaskSession(ws, task, options) {
         model,
         maxTurns,
         branch: freshTask.branch,
-        worktreeBasePath: freshTask.branch && useWorktrees
-            ? (project?.worktreeBasePath || process.env.GRACKLE_WORKTREE_BASE || "/workspace")
+        worktreeBasePath: freshTask.branch
+            ? (workspace?.worktreeBasePath || process.env.GRACKLE_WORKTREE_BASE || "/workspace")
             : "",
+        useWorktrees,
         systemContext,
-        projectId: freshTask.projectId ?? undefined,
+        workspaceId: freshTask.workspaceId ?? undefined,
         taskId: freshTask.id,
         mcpServersJson,
         mcpUrl,
@@ -255,7 +256,7 @@ async function startTaskSession(ws, task, options) {
     processEventStream(conn.client.spawn(powerlineReq), {
         sessionId,
         logPath,
-        projectId: freshTask.projectId ?? undefined,
+        workspaceId: freshTask.workspaceId ?? undefined,
         taskId: freshTask.id,
     });
     return undefined;
@@ -530,7 +531,7 @@ async function handleMessage(ws, msg, subscriptions) {
             if (session.taskId) {
                 const task = taskStore.getTask(session.taskId);
                 if (task) {
-                    emit("task.updated", { taskId: task.id, projectId: task.projectId || "" });
+                    emit("task.updated", { taskId: task.id, workspaceId: task.workspaceId || "" });
                 }
             }
             break;
@@ -563,7 +564,7 @@ async function handleMessage(ws, msg, subscriptions) {
             // Mark task complete (same as "complete_task" handler)
             taskStore.markTaskComplete(taskId, TASK_STATUS.COMPLETE);
             const stoppedTask = taskStore.getTask(taskId);
-            const unblocked = stoppedTask?.projectId ? taskStore.checkAndUnblock(stoppedTask.projectId) : [];
+            const unblocked = stoppedTask?.workspaceId ? taskStore.checkAndUnblock(stoppedTask.workspaceId) : [];
             sendWs(ws, {
                 type: "task_completed",
                 payload: {
@@ -572,7 +573,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 },
             });
             if (stoppedTask) {
-                emit("task.completed", { taskId, projectId: stoppedTask.projectId || "" });
+                emit("task.completed", { taskId, workspaceId: stoppedTask.workspaceId || "" });
             }
             break;
         }
@@ -592,13 +593,13 @@ async function handleMessage(ws, msg, subscriptions) {
             }
             break;
         }
-        // ─── Projects ──────────────────────────────────────────
-        case "list_projects": {
-            const rows = projectStore.listProjects();
+        // ─── Workspaces ────────────────────────────────────────
+        case "list_workspaces": {
+            const rows = workspaceStore.listWorkspaces();
             sendWs(ws, {
-                type: "projects",
+                type: "workspaces",
                 payload: {
-                    projects: rows.map((r) => ({
+                    workspaces: rows.map((r) => ({
                         id: r.id,
                         name: r.name,
                         description: r.description,
@@ -615,47 +616,47 @@ async function handleMessage(ws, msg, subscriptions) {
             });
             break;
         }
-        case "create_project": {
+        case "create_workspace": {
             const name = msg.payload?.name;
             if (!name) {
                 sendWs(ws, { type: "error", payload: { message: "name required" } });
                 return;
             }
-            const baseProjectId = slugify(name) || uuid().slice(0, 8);
-            let id = baseProjectId;
-            for (let attempt = 0; attempt < 10 && projectStore.getProject(id); attempt++) {
-                id = `${baseProjectId}-${uuid().slice(0, 4)}`;
+            const baseWorkspaceId = slugify(name) || uuid().slice(0, 8);
+            let id = baseWorkspaceId;
+            for (let attempt = 0; attempt < 10 && workspaceStore.getWorkspace(id); attempt++) {
+                id = `${baseWorkspaceId}-${uuid().slice(0, 4)}`;
             }
-            if (projectStore.getProject(id)) {
+            if (workspaceStore.getWorkspace(id)) {
                 id = uuid();
             }
             // useWorktrees defaults to true when not specified
             const createUseWorktrees = msg.payload?.useWorktrees ?? true;
-            projectStore.createProject(id, name, msg.payload?.description || "", msg.payload?.repoUrl || "", msg.payload?.defaultEnvironmentId || "", createUseWorktrees, typeof msg.payload?.worktreeBasePath === "string" ? msg.payload.worktreeBasePath.trim() : "", msg.payload?.defaultPersonaId || "");
-            emit("project.created", { projectId: id });
+            workspaceStore.createWorkspace(id, name, msg.payload?.description || "", msg.payload?.repoUrl || "", msg.payload?.defaultEnvironmentId || "", createUseWorktrees, typeof msg.payload?.worktreeBasePath === "string" ? msg.payload.worktreeBasePath.trim() : "", msg.payload?.defaultPersonaId || "");
+            emit("workspace.created", { workspaceId: id });
             break;
         }
-        case "archive_project": {
-            const projectId = msg.payload?.projectId;
-            if (projectId)
-                projectStore.archiveProject(projectId);
-            emit("project.archived", { projectId });
+        case "archive_workspace": {
+            const workspaceId = msg.payload?.workspaceId;
+            if (workspaceId)
+                workspaceStore.archiveWorkspace(workspaceId);
+            emit("workspace.archived", { workspaceId });
             break;
         }
-        case "update_project": {
-            const projectId = msg.payload?.projectId;
-            if (!projectId) {
-                sendWs(ws, { type: "error", payload: { message: "projectId required" } });
+        case "update_workspace": {
+            const workspaceId = msg.payload?.workspaceId;
+            if (!workspaceId) {
+                sendWs(ws, { type: "error", payload: { message: "workspaceId required" } });
                 return;
             }
-            const existing = projectStore.getProject(projectId);
+            const existing = workspaceStore.getWorkspace(workspaceId);
             if (!existing) {
-                sendWs(ws, { type: "error", payload: { message: `Project not found: ${projectId}` } });
+                sendWs(ws, { type: "error", payload: { message: `Workspace not found: ${workspaceId}` } });
                 return;
             }
             const nameVal = typeof msg.payload?.name === "string" ? msg.payload.name : undefined;
             if (nameVal?.trim() === "") {
-                sendWs(ws, { type: "error", payload: { message: "Project name cannot be empty" } });
+                sendWs(ws, { type: "error", payload: { message: "Workspace name cannot be empty" } });
                 return;
             }
             const descVal = typeof msg.payload?.description === "string" ? msg.payload.description : undefined;
@@ -668,7 +669,7 @@ async function handleMessage(ws, msg, subscriptions) {
             const worktreesVal = typeof msg.payload?.useWorktrees === "boolean" ? msg.payload.useWorktrees : undefined;
             const worktreeBasePathVal = typeof msg.payload?.worktreeBasePath === "string" ? msg.payload.worktreeBasePath : undefined;
             const defaultPersonaIdVal = typeof msg.payload?.defaultPersonaId === "string" ? msg.payload.defaultPersonaId : undefined;
-            projectStore.updateProject(projectId, {
+            workspaceStore.updateWorkspace(workspaceId, {
                 name: nameVal !== undefined ? nameVal.trim() : undefined,
                 description: descVal,
                 repoUrl: repoVal,
@@ -677,7 +678,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 worktreeBasePath: worktreeBasePathVal,
                 defaultPersonaId: defaultPersonaIdVal,
             });
-            emit("project.updated", { projectId });
+            emit("workspace.updated", { workspaceId });
             break;
         }
         // ─── Personas ──────────────────────────────────────────
@@ -823,8 +824,8 @@ async function handleMessage(ws, msg, subscriptions) {
         }
         // ─── Tasks ─────────────────────────────────────────────
         case "list_tasks": {
-            const projectId = msg.payload?.projectId || undefined;
-            const rows = taskStore.listTasks(projectId, {
+            const workspaceId = msg.payload?.workspaceId || undefined;
+            const rows = taskStore.listTasks(workspaceId, {
                 search: msg.payload?.search || undefined,
                 status: msg.payload?.status || undefined,
             });
@@ -841,13 +842,13 @@ async function handleMessage(ws, msg, subscriptions) {
             sendWs(ws, {
                 type: "tasks",
                 payload: {
-                    projectId,
+                    workspaceId,
                     tasks: rows.map((r) => {
                         const taskSessions = sessionsByTask.get(r.id) ?? [];
                         const computed = computeTaskStatus(r.status, taskSessions);
                         return {
                             id: r.id,
-                            projectId: r.projectId ?? undefined,
+                            workspaceId: r.workspaceId ?? undefined,
                             title: r.title,
                             description: r.description,
                             status: computed.status,
@@ -868,7 +869,7 @@ async function handleMessage(ws, msg, subscriptions) {
             break;
         }
         case "create_task": {
-            const projectId = msg.payload?.projectId || undefined;
+            const workspaceId = msg.payload?.workspaceId || undefined;
             const title = msg.payload?.title;
             const requestId = typeof msg.payload?.requestId === "string"
                 ? msg.payload.requestId
@@ -880,13 +881,13 @@ async function handleMessage(ws, msg, subscriptions) {
                 });
                 return;
             }
-            let project;
-            if (projectId) {
-                project = projectStore.getProject(projectId);
-                if (!project) {
+            let workspace;
+            if (workspaceId) {
+                workspace = workspaceStore.getWorkspace(workspaceId);
+                if (!workspace) {
                     sendWs(ws, {
                         type: "create_task_error",
-                        payload: { message: `Project not found: ${projectId}`, requestId },
+                        payload: { message: `Workspace not found: ${workspaceId}`, requestId },
                     });
                     return;
                 }
@@ -898,8 +899,8 @@ async function handleMessage(ws, msg, subscriptions) {
             const canDecompose = typeof rawCanDecompose === "boolean" ? rawCanDecompose : false;
             try {
                 const id = uuid().slice(0, 8);
-                taskStore.createTask(id, projectId, title, msg.payload?.description || "", msg.payload?.dependsOn || [], project ? slugify(project.name) : "", parentTaskId, canDecompose, msg.payload?.defaultPersonaId || "");
-                emit("task.created", { taskId: id, projectId, requestId });
+                taskStore.createTask(id, workspaceId, title, msg.payload?.description || "", msg.payload?.dependsOn || [], workspace ? slugify(workspace.name) : "", parentTaskId, canDecompose, msg.payload?.defaultPersonaId || "");
+                emit("task.created", { taskId: id, workspaceId, requestId });
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : "Failed to create task";
@@ -947,13 +948,13 @@ async function handleMessage(ws, msg, subscriptions) {
                 }
                 sessionStore.setSessionTask(lateBindSessionId, updateTaskId);
                 try {
-                    processorRegistry.lateBind(lateBindSessionId, updateTaskId, existingTask.projectId || undefined);
+                    processorRegistry.lateBind(lateBindSessionId, updateTaskId, existingTask.workspaceId || undefined);
                 }
                 catch (err) {
                     sendWs(ws, { type: "error", payload: { message: String(err) } });
                     return;
                 }
-                emit("task.started", { taskId: updateTaskId, sessionId: lateBindSessionId, projectId: existingTask.projectId || "" });
+                emit("task.started", { taskId: updateTaskId, sessionId: lateBindSessionId, workspaceId: existingTask.workspaceId || "" });
                 break;
             }
             // Only allow editing not_started tasks (non-late-bind path)
@@ -982,7 +983,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 ? msg.payload.defaultPersonaId
                 : undefined;
             taskStore.updateTask(updateTaskId, updatedTitle, updatedDescription, existingTask.status, updatedDependsOn, updatedDefaultPersonaId);
-            emit("task.updated", { taskId: updateTaskId, projectId: existingTask.projectId || "" });
+            emit("task.updated", { taskId: updateTaskId, workspaceId: existingTask.workspaceId || "" });
             break;
         }
         case "start_task": {
@@ -1033,7 +1034,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 return;
             taskStore.markTaskComplete(taskId, TASK_STATUS.COMPLETE);
             const task = taskStore.getTask(taskId);
-            const unblocked = task?.projectId ? taskStore.checkAndUnblock(task.projectId) : [];
+            const unblocked = task?.workspaceId ? taskStore.checkAndUnblock(task.workspaceId) : [];
             sendWs(ws, {
                 type: "task_completed",
                 payload: {
@@ -1042,7 +1043,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 },
             });
             if (task) {
-                emit("task.completed", { taskId, projectId: task.projectId || "" });
+                emit("task.completed", { taskId, workspaceId: task.workspaceId || "" });
             }
             break;
         }
@@ -1092,10 +1093,10 @@ async function handleMessage(ws, msg, subscriptions) {
             processEventStream(conn.client.resume(powerlineReq), {
                 sessionId: latestSession.id,
                 logPath,
-                projectId: task.projectId ?? undefined,
+                workspaceId: task.workspaceId ?? undefined,
                 taskId: task.id,
             });
-            emit("task.started", { taskId: task.id, sessionId: latestSession.id, projectId: task.projectId || "" });
+            emit("task.started", { taskId: task.id, sessionId: latestSession.id, workspaceId: task.workspaceId || "" });
             break;
         }
         case "delete_task": {
@@ -1144,7 +1145,7 @@ async function handleMessage(ws, msg, subscriptions) {
                 sendWs(ws, { type: "error", payload: { message: `Failed to delete task ${taskId}: no rows affected` } });
                 return;
             }
-            emit("task.deleted", { taskId, projectId: deletedTask.projectId || "" });
+            emit("task.deleted", { taskId, workspaceId: deletedTask.workspaceId || "" });
             break;
         }
         // ─── Task Sessions ─────────────────────────────────────
@@ -1175,17 +1176,17 @@ async function handleMessage(ws, msg, subscriptions) {
         }
         // ─── Findings ──────────────────────────────────────────
         case "list_findings": {
-            const projectId = msg.payload?.projectId;
-            if (!projectId)
+            const workspaceId = msg.payload?.workspaceId;
+            if (!workspaceId)
                 return;
-            const rows = findingStore.queryFindings(projectId, msg.payload?.categories || undefined, msg.payload?.tags || undefined, msg.payload?.limit || undefined);
+            const rows = findingStore.queryFindings(workspaceId, msg.payload?.categories || undefined, msg.payload?.tags || undefined, msg.payload?.limit || undefined);
             sendWs(ws, {
                 type: "findings",
                 payload: {
-                    projectId,
+                    workspaceId,
                     findings: rows.map((r) => ({
                         id: r.id,
-                        projectId: r.projectId,
+                        workspaceId: r.workspaceId,
                         taskId: r.taskId,
                         sessionId: r.sessionId,
                         category: r.category,
@@ -1199,18 +1200,18 @@ async function handleMessage(ws, msg, subscriptions) {
             break;
         }
         case "post_finding": {
-            const projectId = msg.payload?.projectId;
+            const workspaceId = msg.payload?.workspaceId;
             const title = msg.payload?.title;
-            if (!projectId || !title) {
+            if (!workspaceId || !title) {
                 sendWs(ws, {
                     type: "error",
-                    payload: { message: "projectId and title required" },
+                    payload: { message: "workspaceId and title required" },
                 });
                 return;
             }
             const id = uuid().slice(0, 8);
-            findingStore.postFinding(id, projectId, msg.payload?.taskId || "", msg.payload?.sessionId || "", msg.payload?.category || "general", title, msg.payload?.content || "", msg.payload?.tags || []);
-            sendWs(ws, { type: "finding_posted", payload: { id, projectId } });
+            findingStore.postFinding(id, workspaceId, msg.payload?.taskId || "", msg.payload?.sessionId || "", msg.payload?.category || "general", title, msg.payload?.content || "", msg.payload?.tags || []);
+            sendWs(ws, { type: "finding_posted", payload: { id, workspaceId } });
             break;
         }
         // ─── Diff ──────────────────────────────────────────────
@@ -1226,8 +1227,8 @@ async function handleMessage(ws, msg, subscriptions) {
                 });
                 return;
             }
-            const environmentId = task.projectId
-                ? projectStore.getProject(task.projectId)?.defaultEnvironmentId
+            const environmentId = task.workspaceId
+                ? workspaceStore.getWorkspace(task.workspaceId)?.defaultEnvironmentId
                 : undefined;
             if (!environmentId) {
                 sendWs(ws, {