Merge branch 'main' of github.com:nodetool-ai/nodetool

Author: heavy-d

docs/project-resource-inventory.md

@@ -151,7 +151,7 @@ These findings came from source inspection, not a live visual walkthrough.
 
 | ID | Finding | Source |
 | --- | --- | --- |
-| F1 | Project opening adds all project documents to a shared tab list and selects the overview. | [WorkspaceTabsStore](https://github.com/nodetool-ai/nodetool/blob/main/web/src/stores/WorkspaceTabsStore.ts), [useProjects](https://github.com/nodetool-ai/nodetool/blob/main/web/src/hooks/useProjects.ts) |
-| F2 | The entity library query searches assets without a project filter, while the overview has a project-specific entity section. | [useEntities](https://github.com/nodetool-ai/nodetool/blob/main/web/src/serverState/useEntities.ts), [ProjectEntitiesSection](https://github.com/nodetool-ai/nodetool/blob/main/web/src/components/projects/ProjectEntitiesSection.tsx) |
-| F3 | Assets carry a project field, but the inspected upload payload does not carry project context. | [AssetStore](https://github.com/nodetool-ai/nodetool/blob/main/web/src/stores/AssetStore.ts), [asset schema](https://github.com/nodetool-ai/nodetool/blob/main/packages/models/src/schema/assets.ts) |
-| F4 | The project document summary union omits workflows, and project metadata has one agent-thread pointer. | [project-summary](https://github.com/nodetool-ai/nodetool/blob/main/packages/models/src/project-summary.ts), [project schema](https://github.com/nodetool-ai/nodetool/blob/main/packages/models/src/schema/projects.ts) |
+| F1 | Project opening adds all project documents to a shared tab list and selects the overview. | <a href="https://github.com/nodetool-ai/nodetool/blob/main/web/src/stores/WorkspaceTabsStore.ts">WorkspaceTabsStore</a>, <a href="https://github.com/nodetool-ai/nodetool/blob/main/web/src/hooks/useProjects.ts">useProjects</a> |
+| F2 | The entity library query searches assets without a project filter, while the overview has a project-specific entity section. | <a href="https://github.com/nodetool-ai/nodetool/blob/main/web/src/serverState/useEntities.ts">useEntities</a>, <a href="https://github.com/nodetool-ai/nodetool/blob/main/web/src/components/projects/ProjectEntitiesSection.tsx">ProjectEntitiesSection</a> |
+| F3 | Assets carry a project field, but the inspected upload payload does not carry project context. | <a href="https://github.com/nodetool-ai/nodetool/blob/main/web/src/stores/AssetStore.ts">AssetStore</a>, <a href="https://github.com/nodetool-ai/nodetool/blob/main/packages/models/src/schema/assets.ts">asset schema</a> |
+| F4 | The project document summary union omits workflows, and project metadata has one agent-thread pointer. | <a href="https://github.com/nodetool-ai/nodetool/blob/main/packages/models/src/project-summary.ts">project-summary</a>, <a href="https://github.com/nodetool-ai/nodetool/blob/main/packages/models/src/schema/projects.ts">project schema</a> |

docs/project-scoping/prd.md

@@ -321,15 +321,17 @@ export class Job extends DBModel {
       limit?: number;
       status?: JobStatus;
       workflowId?: string;
+      projectId?: string;
     } = {}
   ): Promise<[Job[], string]> {
-    const { limit = 50, status, workflowId } = opts;
+    const { limit = 50, status, workflowId, projectId } = opts;
     const startKey = opts.startKey ?? opts.cursor;
     const db = getDb();
 
     const conditions = [eq(jobs.user_id, userId)];
     if (status) conditions.push(eq(jobs.status, status));
     if (workflowId) conditions.push(eq(jobs.workflow_id, workflowId));
+    if (projectId !== undefined) conditions.push(eq(jobs.project_id, projectId));
     if (startKey) {
       const cursorRow = await Job.get<Job>(startKey);
       if (cursorRow && cursorRow.user_id === userId) {

packages/models/src/job.ts

@@ -55,14 +55,18 @@ export class Thread extends DBModel {
       startKey?: string;
       reverse?: boolean;
       workflowId?: string;
+      projectId?: string;
     } = {}
   ): Promise<[Thread[], string]> {
-    const { limit = 50, reverse = true, workflowId, startKey } = opts;
+    const { limit = 50, reverse = true, workflowId, projectId, startKey } = opts;
     const db = getDb();
     const conditions = [eq(threads.user_id, userId)];
     if (workflowId !== undefined) {
       conditions.push(eq(threads.workflow_id, workflowId));
     }
+    if (projectId !== undefined) {
+      conditions.push(eq(threads.project_id, projectId));
+    }
     // Seek past the cursor row so following `next` advances the page. Without
     // this the same first page was returned forever while still advertising a
     // cursor.

packages/models/src/thread.ts

@@ -268,13 +268,17 @@ export class Workflow extends DBModel {
       access?: AccessLevel;
       runMode?: WorkflowRunMode | string;
       tag?: string;
+      projectId?: string;
       startKey?: string;
     } = {}
   ): Promise<[Workflow[], string]> {
-    const { limit = 50, access, runMode, tag, startKey } = opts;
+    const { limit = 50, access, runMode, tag, projectId, startKey } = opts;
     const db = getDb();
 
     const conditions = [eq(workflows.user_id, userId)];
+    if (projectId !== undefined) {
+      conditions.push(eq(workflows.project_id, projectId));
+    }
     if (access) conditions.push(eq(workflows.access, access));
     if (runMode) {
       conditions.push(eq(workflows.run_mode, runMode));
@@ -336,11 +340,14 @@ export class Workflow extends DBModel {
    */
   static async paginateSummaries(
     userId: string,
-    opts: { limit?: number; startKey?: string } = {}
+    opts: { limit?: number; projectId?: string; startKey?: string } = {}
   ): Promise<[WorkflowSummary[], string]> {
-    const { limit = 50, startKey } = opts;
+    const { limit = 50, projectId, startKey } = opts;
     const db = getDb();
     const conditions = [eq(workflows.user_id, userId)];
+    if (projectId !== undefined) {
+      conditions.push(eq(workflows.project_id, projectId));
+    }
 
     if (startKey) {
       const [cursor] = await db
@@ -444,14 +451,17 @@ export class Workflow extends DBModel {
 
   static async paginateTools(
     userId: string,
-    opts: { limit?: number; startKey?: string } = {}
+    opts: { limit?: number; projectId?: string; startKey?: string } = {}
   ): Promise<[Workflow[], string]> {
-    const { limit = 50, startKey } = opts;
+    const { limit = 50, projectId, startKey } = opts;
     const db = getDb();
     const conditions = [
       eq(workflows.user_id, userId),
       eq(workflows.run_mode, "tool")
     ];
+    if (projectId !== undefined) {
+      conditions.push(eq(workflows.project_id, projectId));
+    }
     if (startKey) {
       const cursor = await Workflow.get<Workflow>(startKey);
       if (cursor && cursor.user_id === userId) {

packages/models/src/workflow.ts

@@ -90,14 +90,18 @@ export class Workspace extends DBModel {
 
   static async paginate(
     userId: string,
-    opts: { limit?: number; startKey?: string } = {}
+    opts: { limit?: number; projectId?: string; startKey?: string } = {}
   ): Promise<[Workspace[], string]> {
-    const { limit = 50 } = opts;
+    const { limit = 50, projectId } = opts;
     const db = getDb();
+    const conditions = [eq(workspaces.user_id, userId)];
+    if (projectId !== undefined) {
+      conditions.push(eq(workspaces.project_id, projectId));
+    }
     const rows = await db
       .select()
       .from(workspaces)
-      .where(eq(workspaces.user_id, userId))
+      .where(and(...conditions))
       .limit(limit + 1);
 
     const items = rows.map((r: Record<string, unknown>) => new Workspace(r));

packages/models/src/workspace.ts

@@ -530,6 +530,15 @@ describe("Built-in migrations", () => {
     expect(await adapter.tableExists("nodetool_workflow_shares")).toBe(true);
     expect(await adapter.tableExists("projects")).toBe(true);
 
+    for (const table of [
+      "nodetool_workflows",
+      "nodetool_threads",
+      "nodetool_jobs",
+      "nodetool_workspaces"
+    ]) {
+      expect(await adapter.columnExists(table, "project_id")).toBe(true);
+    }
+
     // Ledger rows carry the project (and document) they were spent on.
     expect(
       await adapter.columnExists("nodetool_predictions", "project_id")

packages/models/tests/migrations.test.ts

@@ -6,6 +6,7 @@ import { Workflow } from "../src/workflow.js";
 import { Asset } from "../src/asset.js";
 import { Message } from "../src/message.js";
 import { Thread } from "../src/thread.js";
+import { Workspace } from "../src/workspace.js";
 
 // ── Setup ────────────────────────────────────────────────────────────
 
@@ -341,6 +342,69 @@ describe("Workflow model", () => {
     );
   });
 
+  it("scopes workflow pages by project without changing the legacy default", async () => {
+    await Workflow.create<Workflow>({
+      user_id: "u1",
+      project_id: "p1",
+      name: "One",
+      graph: { nodes: [], edges: [] }
+    });
+    await Workflow.create<Workflow>({
+      user_id: "u1",
+      project_id: "p2",
+      name: "Two",
+      graph: { nodes: [], edges: [] }
+    });
+
+    const [all] = await Workflow.paginate("u1");
+    const [one] = await Workflow.paginate("u1", { projectId: "p1" });
+    const [summaries] = await Workflow.paginateSummaries("u1", {
+      projectId: "p1"
+    });
+    const [tools] = await Workflow.paginateTools("u1", {
+      projectId: "p1"
+    });
+
+    expect(all).toHaveLength(2);
+    expect(one.map((workflow) => workflow.project_id)).toEqual(["p1"]);
+    expect(summaries.map((workflow) => workflow.id)).toEqual([one[0].id]);
+    expect(tools).toEqual([]);
+  });
+
+  it("scopes job and thread pages by project", async () => {
+    await Job.create<Job>({ user_id: "u1", workflow_id: "w1", project_id: "p1" });
+    await Job.create<Job>({ user_id: "u1", workflow_id: "w2", project_id: "p2" });
+    await Thread.create<Thread>({ user_id: "u1", project_id: "p1", title: "One" });
+    await Thread.create<Thread>({ user_id: "u1", project_id: "p2", title: "Two" });
+
+    const [jobs] = await Job.paginate("u1", { projectId: "p1" });
+    const [threads] = await Thread.paginate("u1", { projectId: "p1" });
+
+    expect(jobs.map((job) => job.project_id)).toEqual(["p1"]);
+    expect(threads.map((thread) => thread.project_id)).toEqual(["p1"]);
+  });
+
+  it("scopes workspace pages by project", async () => {
+    await Workspace.create<Workspace>({
+      user_id: "u1",
+      project_id: "p1",
+      name: "One",
+      path: "/tmp/one"
+    });
+    await Workspace.create<Workspace>({
+      user_id: "u1",
+      project_id: "p2",
+      name: "Two",
+      path: "/tmp/two"
+    });
+
+    const [workspaces] = await Workspace.paginate("u1", {
+      projectId: "p2"
+    });
+
+    expect(workspaces.map((workspace) => workspace.project_id)).toEqual(["p2"]);
+  });
+
   it("paginate with access filter", async () => {
     await Workflow.create<Workflow>({
       user_id: "u1",

packages/models/tests/models.test.ts

@@ -7,6 +7,7 @@ import { z } from "zod";
 export const jobResponse = z.object({
   id: z.string(),
   user_id: z.string(),
+  project_id: z.string().optional(),
   job_type: z.literal("workflow"),
   status: z.string(),
   name: z.string().nullable(),
@@ -24,6 +25,7 @@ export type JobResponse = z.infer<typeof jobResponse>;
 // `/running/all` and the cancel endpoint response.
 export const backgroundJobResponse = z.object({
   job_id: z.string(),
+  project_id: z.string().optional(),
   status: z.string(),
   workflow_id: z.string(),
   created_at: z.string().nullable(),
@@ -36,6 +38,7 @@ export type BackgroundJobResponse = z.infer<typeof backgroundJobResponse>;
 export const listInput = z.object({
   limit: z.number().int().min(1).max(500).default(100),
   workflow_id: z.string().optional(),
+  project_id: z.string().optional(),
   include_outputs: z.boolean().default(false),
   // Cursor from a previous response's next_start_key. Without this the returned
   // cursor could never be submitted, so pagination past the first page was

packages/protocol/src/api-schemas/jobs.ts

@@ -5,6 +5,7 @@ import { z } from "zod";
 export const threadResponse = z.object({
   id: z.string(),
   user_id: z.string(),
+  project_id: z.string().optional(),
   workflow_id: z.string().nullable().optional(),
   title: z.string().nullable(),
   created_at: z.string(),
@@ -20,7 +21,8 @@ export const listInput = z.object({
   limit: z.number().int().min(1).max(500).default(10),
   cursor: z.string().optional(),
   reverse: z.boolean().optional(),
-  workflow_id: z.string().optional()
+  workflow_id: z.string().optional(),
+  project_id: z.string().optional()
 });
 export type ListInput = z.infer<typeof listInput>;
 
@@ -40,7 +42,8 @@ export type GetInput = z.infer<typeof getInput>;
 // `title` is optional; defaults to "New Thread" server-side.
 export const createInput = z.object({
   title: z.string().optional(),
-  workflow_id: z.string().nullable().optional()
+  workflow_id: z.string().nullable().optional(),
+  project_id: z.string().default("default")
 });
 export type CreateInput = z.infer<typeof createInput>;