@contextstream/mcp-server 0.3.20 → 0.3.21

package/dist/index.js

@@ -4611,7 +4611,9 @@ var CacheTTL = {
   // Search results - cache for 60 seconds
   SEARCH: 60 * 1e3,
   // User preferences - cache for 5 minutes
-  USER_PREFS: 5 * 60 * 1e3
+  USER_PREFS: 5 * 60 * 1e3,
+  // Credits/plan - cache briefly to reflect upgrades quickly
+  CREDIT_BALANCE: 60 * 1e3
 };
 var CacheKeys = {
   workspace: (id) => `workspace:${id}`,
@@ -4620,7 +4622,8 @@ var CacheKeys = {
   projectList: (workspaceId) => `projects:${workspaceId}`,
   sessionInit: (workspaceId, projectId) => `session_init:${workspaceId || ""}:${projectId || ""}`,
   memoryEvents: (workspaceId) => `memory:${workspaceId}`,
-  search: (query, workspaceId) => `search:${workspaceId || ""}:${query}`
+  search: (query, workspaceId) => `search:${workspaceId || ""}:${query}`,
+  creditBalance: () => "credits:balance"
 };
 var globalCache = new MemoryCache();
 
@@ -4666,6 +4669,25 @@ var ContextStreamClient = class {
   me() {
     return request(this.config, "/auth/me");
   }
+  // Credits / Billing (used for plan gating)
+  async getCreditBalance() {
+    const cacheKey = CacheKeys.creditBalance();
+    const cached = globalCache.get(cacheKey);
+    if (cached) return cached;
+    const result = await request(this.config, "/credits/balance", { method: "GET" });
+    const data = result && typeof result === "object" && "data" in result && result.data ? result.data : result;
+    globalCache.set(cacheKey, data, CacheTTL.CREDIT_BALANCE);
+    return data;
+  }
+  async getPlanName() {
+    try {
+      const balance = await this.getCreditBalance();
+      const planName = balance?.plan?.name;
+      return typeof planName === "string" ? planName.toLowerCase() : null;
+    } catch {
+      return null;
+    }
+  }
   // Workspaces & Projects
   listWorkspaces(params) {
     const query = new URLSearchParams();
@@ -5053,22 +5075,15 @@ var ContextStreamClient = class {
               return context;
             }
           } else {
-            const newWorkspace = await this.createWorkspace({
-              name: folderName || "My Workspace",
-              description: `Workspace created for ${rootPath}`,
-              visibility: "private"
-            });
-            if (newWorkspace.id) {
-              workspaceId = newWorkspace.id;
-              workspaceName = newWorkspace.name;
-              context.workspace_source = "auto_created";
-              context.workspace_created = true;
-              writeLocalConfig(rootPath, {
-                workspace_id: newWorkspace.id,
-                workspace_name: newWorkspace.name,
-                associated_at: (/* @__PURE__ */ new Date()).toISOString()
-              });
-            }
+            const folderDisplayName = rootPath?.split("/").pop() || "this folder";
+            context.status = "requires_workspace_name";
+            context.workspace_source = "none_found";
+            context.ide_roots = ideRoots;
+            context.folder_name = folderDisplayName;
+            context.folder_path = rootPath;
+            context.suggested_project_name = folderDisplayName;
+            context.message = `No workspaces found for this account. Ask the user for a name for a new workspace, then create a project for "${folderDisplayName}".`;
+            return context;
           }
         } catch (e) {
           context.workspace_error = String(e);
@@ -6455,6 +6470,39 @@ function toStructured(data) {
   return void 0;
 }
 function registerTools(server, client, sessionManager) {
+  const upgradeUrl2 = process.env.CONTEXTSTREAM_UPGRADE_URL || "https://contextstream.io/pricing";
+  const defaultProTools = /* @__PURE__ */ new Set([
+    // AI endpoints (typically paid/credit-metered)
+    "ai_context",
+    "ai_enhanced_context",
+    "ai_context_budget",
+    "ai_embeddings",
+    "ai_plan",
+    "ai_tasks"
+  ]);
+  const proTools = (() => {
+    const raw = process.env.CONTEXTSTREAM_PRO_TOOLS;
+    if (!raw) return defaultProTools;
+    const parsed = raw.split(",").map((t) => t.trim()).filter(Boolean);
+    return parsed.length > 0 ? new Set(parsed) : defaultProTools;
+  })();
+  function getToolAccessTier(toolName) {
+    return proTools.has(toolName) ? "pro" : "free";
+  }
+  function getToolAccessLabel(toolName) {
+    return getToolAccessTier(toolName) === "pro" ? "PRO" : "Free";
+  }
+  async function gateIfProTool(toolName) {
+    if (getToolAccessTier(toolName) !== "pro") return null;
+    const planName = await client.getPlanName();
+    if (planName !== "free") return null;
+    return errorResult(
+      [
+        `Access denied: \`${toolName}\` requires ContextStream PRO.`,
+        `Upgrade: ${upgradeUrl2}`
+      ].join("\n")
+    );
+  }
   function wrapWithAutoContext(toolName, handler) {
     if (!sessionManager) {
       return handler;
@@ -6483,8 +6531,18 @@ function registerTools(server, client, sessionManager) {
     };
   }
   function registerTool(name, config, handler) {
+    const accessLabel = getToolAccessLabel(name);
+    const labeledConfig = {
+      ...config,
+      title: `${config.title} (${accessLabel})`,
+      description: `${config.description}
+
+Access: ${accessLabel}${accessLabel === "PRO" ? ` (upgrade: ${upgradeUrl2})` : ""}`
+    };
     const safeHandler = async (input) => {
       try {
+        const gated = await gateIfProTool(name);
+        if (gated) return gated;
         return await handler(input);
       } catch (error) {
         const errorMessage = error?.message || String(error);
@@ -6498,10 +6556,26 @@ function registerTools(server, client, sessionManager) {
     };
     server.registerTool(
       name,
-      config,
+      labeledConfig,
       wrapWithAutoContext(name, safeHandler)
     );
   }
+  function errorResult(text) {
+    return {
+      content: [{ type: "text", text }],
+      isError: true
+    };
+  }
+  function resolveWorkspaceId(explicitWorkspaceId) {
+    if (explicitWorkspaceId) return explicitWorkspaceId;
+    const ctx = sessionManager?.getContext();
+    return typeof ctx?.workspace_id === "string" ? ctx.workspace_id : void 0;
+  }
+  function resolveProjectId(explicitProjectId) {
+    if (explicitProjectId) return explicitProjectId;
+    const ctx = sessionManager?.getContext();
+    return typeof ctx?.project_id === "string" ? ctx.project_id : void 0;
+  }
   registerTool(
     "auth_me",
     {
@@ -6638,10 +6712,14 @@ function registerTools(server, client, sessionManager) {
     {
       title: "Index project",
       description: "Trigger indexing for a project",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.indexProject(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.indexProject(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -6991,10 +7069,14 @@ function registerTools(server, client, sessionManager) {
     {
       title: "Get project",
       description: "Get project details by ID",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.getProject(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.getProject(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7003,10 +7085,14 @@ function registerTools(server, client, sessionManager) {
     {
       title: "Project overview",
       description: "Get project overview with summary information",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.projectOverview(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.projectOverview(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7015,10 +7101,14 @@ function registerTools(server, client, sessionManager) {
     {
       title: "Project statistics",
       description: "Get project statistics (files, lines, complexity)",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.projectStatistics(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.projectStatistics(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7027,10 +7117,14 @@ function registerTools(server, client, sessionManager) {
     {
       title: "List project files",
       description: "List all indexed files in a project",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.projectFiles(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.projectFiles(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7039,10 +7133,14 @@ function registerTools(server, client, sessionManager) {
     {
       title: "Index status",
       description: "Get project indexing status",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.projectIndexStatus(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.projectIndexStatus(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7054,18 +7152,22 @@ function registerTools(server, client, sessionManager) {
 This indexes your entire project by reading files in batches.
 Automatically detects code files and skips ignored directories like node_modules, target, dist, etc.`,
       inputSchema: external_exports.object({
-        project_id: external_exports.string().uuid().describe("Project to ingest files into"),
+        project_id: external_exports.string().uuid().optional().describe("Project to ingest files into (defaults to current session project)"),
         path: external_exports.string().describe("Local directory path to read files from")
       })
     },
     async (input) => {
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
       (async () => {
         try {
           let totalIndexed = 0;
           let batchCount = 0;
-          console.error(`[ContextStream] Starting background ingestion for project ${input.project_id} from ${input.path}`);
+          console.error(`[ContextStream] Starting background ingestion for project ${projectId} from ${input.path}`);
           for await (const batch of readAllFilesInBatches(input.path, { batchSize: 50 })) {
-            const result = await client.ingestFiles(input.project_id, batch);
+            const result = await client.ingestFiles(projectId, batch);
             totalIndexed += result.data?.files_indexed ?? batch.length;
             batchCount++;
           }
@@ -7077,7 +7179,7 @@ Automatically detects code files and skips ignored directories like node_modules
       const summary = {
         status: "started",
         message: "Ingestion running in background",
-        project_id: input.project_id,
+        project_id: projectId,
         path: input.path,
         note: "Use 'projects_index_status' to monitor progress."
       };
@@ -7095,10 +7197,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Get workspace",
       description: "Get workspace details by ID",
-      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.getWorkspace(input.workspace_id);
+      const workspaceId = resolveWorkspaceId(input.workspace_id);
+      if (!workspaceId) {
+        return errorResult("Error: workspace_id is required. Please call session_init first or provide workspace_id explicitly.");
+      }
+      const result = await client.getWorkspace(workspaceId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7107,10 +7213,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Workspace overview",
       description: "Get workspace overview with summary information",
-      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.workspaceOverview(input.workspace_id);
+      const workspaceId = resolveWorkspaceId(input.workspace_id);
+      if (!workspaceId) {
+        return errorResult("Error: workspace_id is required. Please call session_init first or provide workspace_id explicitly.");
+      }
+      const result = await client.workspaceOverview(workspaceId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7119,10 +7229,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Workspace analytics",
       description: "Get workspace usage analytics",
-      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.workspaceAnalytics(input.workspace_id);
+      const workspaceId = resolveWorkspaceId(input.workspace_id);
+      if (!workspaceId) {
+        return errorResult("Error: workspace_id is required. Please call session_init first or provide workspace_id explicitly.");
+      }
+      const result = await client.workspaceAnalytics(workspaceId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7131,10 +7245,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Workspace content",
       description: "List content in a workspace",
-      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.workspaceContent(input.workspace_id);
+      const workspaceId = resolveWorkspaceId(input.workspace_id);
+      if (!workspaceId) {
+        return errorResult("Error: workspace_id is required. Please call session_init first or provide workspace_id explicitly.");
+      }
+      const result = await client.workspaceContent(workspaceId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7256,10 +7374,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Memory timeline",
       description: "Get chronological timeline of memory events for a workspace",
-      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.memoryTimeline(input.workspace_id);
+      const workspaceId = resolveWorkspaceId(input.workspace_id);
+      if (!workspaceId) {
+        return errorResult("Error: workspace_id is required. Please call session_init first or provide workspace_id explicitly.");
+      }
+      const result = await client.memoryTimeline(workspaceId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7268,10 +7390,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Memory summary",
       description: "Get condensed summary of workspace memory",
-      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ workspace_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.memorySummary(input.workspace_id);
+      const workspaceId = resolveWorkspaceId(input.workspace_id);
+      if (!workspaceId) {
+        return errorResult("Error: workspace_id is required. Please call session_init first or provide workspace_id explicitly.");
+      }
+      const result = await client.memorySummary(workspaceId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7280,10 +7406,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Find circular dependencies",
       description: "Detect circular dependencies in project code",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.findCircularDependencies(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.findCircularDependencies(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7292,10 +7422,14 @@ Automatically detects code files and skips ignored directories like node_modules
     {
       title: "Find unused code",
       description: "Detect unused code in project",
-      inputSchema: external_exports.object({ project_id: external_exports.string().uuid() })
+      inputSchema: external_exports.object({ project_id: external_exports.string().uuid().optional() })
     },
     async (input) => {
-      const result = await client.findUnusedCode(input.project_id);
+      const projectId = resolveProjectId(input.project_id);
+      if (!projectId) {
+        return errorResult("Error: project_id is required. Please call session_init first or provide project_id explicitly.");
+      }
+      const result = await client.findUnusedCode(projectId);
       return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
     }
   );
@@ -7440,6 +7574,117 @@ Optionally generates AI editor rules for automatic ContextStream usage.`,
       return { content: [{ type: "text", text: formatContent(response) }], structuredContent: toStructured(response) };
     }
   );
+  registerTool(
+    "workspace_bootstrap",
+    {
+      title: "Create workspace + project from folder",
+      description: `Create a new workspace (user-provided name) and onboard the current folder as a project.
+This is useful when session_init returns status='requires_workspace_name' (no workspaces exist yet) or when you want to create a new workspace for a repo.
+
+Behavior:
+- Creates a workspace with the given name
+- Associates the folder to that workspace (writes .contextstream/config.json)
+- Initializes a session for the folder, which creates the project (folder name) and starts indexing (if enabled)`,
+      inputSchema: external_exports.object({
+        workspace_name: external_exports.string().min(1).describe("Name for the new workspace (ask the user)"),
+        folder_path: external_exports.string().optional().describe("Absolute folder path (defaults to IDE root/cwd)"),
+        description: external_exports.string().optional().describe("Optional workspace description"),
+        visibility: external_exports.enum(["private", "public"]).optional().describe("Workspace visibility (default: private)"),
+        create_parent_mapping: external_exports.boolean().optional().describe("Also create a parent folder mapping (e.g., /dev/company/* -> workspace)"),
+        generate_editor_rules: external_exports.boolean().optional().describe("Generate AI editor rules in the folder for automatic ContextStream usage"),
+        context_hint: external_exports.string().optional().describe("Optional context hint for session initialization"),
+        auto_index: external_exports.boolean().optional().describe("Automatically create and index project from folder (default: true)")
+      })
+    },
+    async (input) => {
+      let folderPath = input.folder_path;
+      if (!folderPath) {
+        try {
+          const rootsResponse = await server.server.listRoots();
+          if (rootsResponse?.roots && rootsResponse.roots.length > 0) {
+            folderPath = rootsResponse.roots[0].uri.replace("file://", "");
+          }
+        } catch {
+        }
+      }
+      if (!folderPath) {
+        folderPath = process.cwd();
+      }
+      if (!folderPath) {
+        return errorResult("Error: folder_path is required. Provide folder_path or run from a project directory.");
+      }
+      const folderName = folderPath.split("/").pop() || "My Project";
+      const newWorkspace = await client.createWorkspace({
+        name: input.workspace_name,
+        description: input.description || `Workspace created for ${folderPath}`,
+        visibility: input.visibility || "private"
+      });
+      if (!newWorkspace?.id) {
+        return errorResult("Error: failed to create workspace.");
+      }
+      const associateResult = await client.associateWorkspace({
+        folder_path: folderPath,
+        workspace_id: newWorkspace.id,
+        workspace_name: newWorkspace.name || input.workspace_name,
+        create_parent_mapping: input.create_parent_mapping
+      });
+      let rulesGenerated = [];
+      if (input.generate_editor_rules) {
+        const fs3 = await import("fs");
+        const path3 = await import("path");
+        for (const editor of getAvailableEditors()) {
+          const rule = generateRuleContent(editor, {
+            workspaceName: newWorkspace.name || input.workspace_name,
+            workspaceId: newWorkspace.id
+          });
+          if (!rule) continue;
+          const filePath = path3.join(folderPath, rule.filename);
+          try {
+            let existingContent = "";
+            try {
+              existingContent = fs3.readFileSync(filePath, "utf-8");
+            } catch {
+            }
+            if (!existingContent) {
+              fs3.writeFileSync(filePath, rule.content);
+              rulesGenerated.push(rule.filename);
+            } else if (!existingContent.includes("ContextStream Integration")) {
+              fs3.writeFileSync(filePath, existingContent + "\n\n" + rule.content);
+              rulesGenerated.push(rule.filename + " (appended)");
+            }
+          } catch {
+          }
+        }
+      }
+      const session = await client.initSession(
+        {
+          workspace_id: newWorkspace.id,
+          context_hint: input.context_hint,
+          include_recent_memory: true,
+          include_decisions: true,
+          auto_index: input.auto_index
+        },
+        [folderPath]
+      );
+      if (sessionManager) {
+        sessionManager.markInitialized(session);
+      }
+      const response = {
+        ...session,
+        bootstrap: {
+          folder_path: folderPath,
+          project_name: folderName,
+          workspace: {
+            id: newWorkspace.id,
+            name: newWorkspace.name || input.workspace_name
+          },
+          association: associateResult,
+          editor_rules_generated: rulesGenerated.length > 0 ? rulesGenerated : void 0
+        }
+      };
+      return { content: [{ type: "text", text: formatContent(response) }], structuredContent: toStructured(response) };
+    }
+  );
   registerTool(
     "session_capture",
     {
@@ -7626,7 +7871,7 @@ Returns lessons filtered by:
         limit: input.limit * 2
         // Fetch more to filter
       });
-      let lessons = (searchResult?.results || []).filter((item) => {
+      let lessons = (searchResult.results || []).filter((item) => {
         const tags = item.metadata?.tags || [];
         const isLesson = tags.includes("lesson");
         if (!isLesson) return false;
@@ -8171,34 +8416,47 @@ function registerResources(server, client, apiUrl) {
 }
 
 // src/prompts.ts
+var ID_NOTES = [
+  "Notes:",
+  "- If ContextStream is not initialized in this conversation, call `session_init` first (omit ids).",
+  "- Do not ask me for `workspace_id`/`project_id` \u2014 use session defaults or IDs returned by `session_init`.",
+  "- Prefer omitting IDs in tool calls when the tool supports defaults."
+];
+var upgradeUrl = process.env.CONTEXTSTREAM_UPGRADE_URL || "https://contextstream.io/pricing";
+var proPrompts = /* @__PURE__ */ new Set([
+  "build-context",
+  "generate-plan",
+  "generate-tasks",
+  "token-budget-context"
+]);
+function promptAccessLabel(promptName) {
+  return proPrompts.has(promptName) ? "PRO" : "Free";
+}
 function registerPrompts(server) {
   server.registerPrompt(
     "explore-codebase",
     {
-      title: "Explore Codebase",
-      description: "Get an overview of a project codebase structure and key components",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID to explore (optional if session_init has set defaults)"),
-        focus_area: external_exports.string().optional().describe('Optional area to focus on (e.g., "authentication", "api routes")')
-      }
+      title: `Explore Codebase (${promptAccessLabel("explore-codebase")})`,
+      description: "Get an overview of a project codebase structure and key components"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `I want to understand the codebase${args.project_id ? ` for project ${args.project_id}` : ""}${args.focus_area ? ` with focus on ${args.focus_area}` : ""}.
-
-If project_id is not provided, first call \`session_init\` (or \`projects_list\`) to resolve the current project ID.
-
-Please help me by:
-1. First, use \`projects_overview\` to get the project summary
-2. Use \`projects_files\` to list the key files
-3. Use \`search_semantic\` to find relevant code${args.focus_area ? ` related to "${args.focus_area}"` : ""}
-4. Summarize the architecture and key patterns you observe
-
-Provide a clear, structured overview that helps me navigate this codebase effectively.`
+            text: [
+              "I want to understand the current codebase.",
+              "",
+              ...ID_NOTES,
+              "",
+              "Please help me by:",
+              "1. Use `projects_overview` to get a project summary (use session defaults; only pass `project_id` if required).",
+              "2. Use `projects_files` to identify key entry points.",
+              "3. If a focus area is clear from our conversation, prioritize it; otherwise ask me what to focus on.",
+              "4. Use `search_semantic` (and optionally `search_hybrid`) to find the most relevant files.",
+              "5. Summarize the architecture, major modules, and where to start editing."
+            ].join("\n")
           }
         }
       ]
@@ -8207,40 +8465,32 @@ Provide a clear, structured overview that helps me navigate this codebase effect
   server.registerPrompt(
     "capture-decision",
     {
-      title: "Capture Decision",
-      description: "Document an architectural or technical decision in workspace memory",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional if session_init has set defaults)"),
-        decision_title: external_exports.string().describe("Brief title of the decision"),
-        context: external_exports.string().describe("What prompted this decision"),
-        decision: external_exports.string().describe("The decision made"),
-        consequences: external_exports.string().optional().describe("Expected consequences or tradeoffs")
-      }
+      title: `Capture Decision (${promptAccessLabel("capture-decision")})`,
+      description: "Document an architectural or technical decision in workspace memory"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Please document the following decision in workspace memory:
-
-**Title:** ${args.decision_title}
-**Context:** ${args.context}
-**Decision:** ${args.decision}
-${args.consequences ? `**Consequences:** ${args.consequences}` : ""}
-
-If workspace_id is not provided, first call \`session_init\` to resolve the workspace, then capture the decision.
-
-Use \`session_capture\` with:
-- event_type: "decision"
-${args.workspace_id ? `- workspace_id: "${args.workspace_id}"` : "- workspace_id: (omit to use session defaults)"}
-- title: "${args.decision_title}"
-- content: A well-formatted ADR (Architecture Decision Record) with context, decision, and consequences
-- tags: Include relevant tags (e.g., "adr", "architecture")
-- importance: "high"
-
-After creating, confirm the decision was recorded and summarize it.`
+            text: [
+              "Please capture an architectural/technical decision in ContextStream memory.",
+              "",
+              ...ID_NOTES,
+              "",
+              "Instructions:",
+              "- If the decision is already described in this conversation, extract: title, context, decision, consequences/tradeoffs.",
+              "- If anything is missing, ask me 1\u20133 quick questions to fill the gaps.",
+              "- Then call `session_capture` with:",
+              '  - event_type: "decision"',
+              "  - title: (short ADR title)",
+              "  - content: a well-formatted ADR (Context, Decision, Consequences)",
+              '  - tags: include relevant tags (e.g., "adr", "architecture")',
+              '  - importance: "high"',
+              "",
+              "After capturing, confirm what was saved."
+            ].join("\n")
           }
         }
       ]
@@ -8249,35 +8499,35 @@ After creating, confirm the decision was recorded and summarize it.`
   server.registerPrompt(
     "review-context",
     {
-      title: "Code Review Context",
-      description: "Build context for reviewing code changes",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional if session_init has set defaults)"),
-        file_paths: external_exports.string().describe("Comma-separated file paths being changed"),
-        change_description: external_exports.string().describe("Brief description of the changes")
-      }
+      title: `Code Review Context (${promptAccessLabel("review-context")})`,
+      description: "Build context for reviewing code changes"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `I need context to review changes in these files: ${args.file_paths}
-
-Change description: ${args.change_description}
-
-Please help me understand the impact by:
-1. Use \`graph_dependencies\` to find what depends on these files
-2. Use \`graph_impact\` to analyze potential impact
-3. Use \`memory_search\` to find related decisions or notes about these areas
-4. Use \`search_semantic\` to find related code patterns
-
-Provide:
-- Summary of what these files do
-- What other parts of the codebase might be affected
-- Any relevant past decisions or context from memory
-- Potential risks or areas to focus the review on`
+            text: [
+              "I need context to review a set of code changes.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If file paths and a short change description are not already in this conversation, ask me for them.",
+              "",
+              "Then build review context by:",
+              "1. Using `graph_dependencies` to find what depends on the changed areas.",
+              "2. Using `graph_impact` to assess potential blast radius.",
+              "3. Using `memory_search` to find related decisions/notes.",
+              "4. Using `search_semantic` to find related code patterns.",
+              "",
+              "Provide:",
+              "- What the files/components do",
+              "- What might be affected",
+              "- Relevant prior decisions/lessons",
+              "- Review checklist + risks to focus on"
+            ].join("\n")
           }
         }
       ]
@@ -8286,36 +8536,36 @@ Provide:
   server.registerPrompt(
     "investigate-bug",
     {
-      title: "Investigate Bug",
-      description: "Build context for debugging an issue",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional if session_init has set defaults)"),
-        error_message: external_exports.string().describe("Error message or symptom"),
-        affected_area: external_exports.string().optional().describe("Known affected area or component")
-      }
+      title: `Investigate Bug (${promptAccessLabel("investigate-bug")})`,
+      description: "Build context for debugging an issue"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `I'm investigating a bug:
-
-**Error/Symptom:** ${args.error_message}
-${args.affected_area ? `**Affected Area:** ${args.affected_area}` : ""}
-
-Please help me investigate by:
-1. Use \`search_semantic\` to find code related to this error
-2. Use \`search_pattern\` to find where similar errors are thrown
-3. Use \`graph_call_path\` to trace call flows if we identify key functions
-4. Use \`memory_search\` to check if this issue has been encountered before
-
-Provide:
-- Likely locations where this error originates
-- Call flow analysis
-- Any related past issues from memory
-- Suggested debugging approach`
+            text: [
+              "I want help investigating a bug.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If the error/symptom is not already stated, ask me for the exact error message and what I expected vs what happened.",
+              "- If an affected area/component is not known, ask me where I noticed it.",
+              "",
+              "Then:",
+              "1. Use `search_semantic` to find code related to the error/symptom.",
+              "2. Use `search_pattern` to locate where similar errors are thrown or logged.",
+              "3. If you identify key functions, use `graph_call_path` to trace call flows.",
+              "4. Use `memory_search` to check if we have prior notes/bugs about this area.",
+              "",
+              "Return:",
+              "- Likely origin locations",
+              "- Call flow (if found)",
+              "- Related past context",
+              "- Suggested debugging steps"
+            ].join("\n")
           }
         }
       ]
@@ -8324,34 +8574,32 @@ Provide:
   server.registerPrompt(
     "explore-knowledge",
     {
-      title: "Explore Knowledge Graph",
-      description: "Navigate and understand the knowledge graph for a workspace",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional if session_init has set defaults)"),
-        starting_topic: external_exports.string().optional().describe("Topic to start exploration from")
-      }
+      title: `Explore Knowledge Graph (${promptAccessLabel("explore-knowledge")})`,
+      description: "Navigate and understand the knowledge graph for a workspace"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Help me explore the knowledge captured in the current workspace${args.workspace_id ? ` (${args.workspace_id})` : ""}${args.starting_topic ? ` starting from "${args.starting_topic}"` : ""}.
-
-If workspace_id is not provided, first call \`session_init\` to resolve the workspace.
-
-Please:
-1. Use \`memory_list_nodes\` to see available knowledge nodes
-2. Use \`memory_decisions\` to see decision history
-3. ${args.starting_topic ? `Use \`memory_search\` to find nodes related to "${args.starting_topic}"` : "Use `memory_summary` to get an overview"}
-4. Use \`graph_related\` to explore connections between nodes
-
-Provide:
-- Overview of knowledge captured
-- Key themes and topics
-- Important decisions and their rationale
-- Connections between different pieces of knowledge`
+            text: [
+              "Help me explore the knowledge captured in this workspace.",
+              "",
+              ...ID_NOTES,
+              "",
+              "Approach:",
+              "1. Use `memory_summary` for a high-level overview.",
+              "2. Use `memory_decisions` to see decision history (titles + a few key details).",
+              "3. Use `memory_list_nodes` to see available knowledge nodes.",
+              "4. If a starting topic is clear from the conversation, use `memory_search` for it.",
+              "5. Use `graph_related` on the most relevant nodes to expand connections.",
+              "",
+              "Provide:",
+              "- Key themes and topics",
+              "- Important decisions + rationale",
+              "- Suggested \u201Cnext nodes\u201D to explore"
+            ].join("\n")
           }
         }
       ]
@@ -8360,37 +8608,37 @@ Provide:
   server.registerPrompt(
     "onboard-to-project",
     {
-      title: "Project Onboarding",
-      description: "Generate onboarding context for a new team member",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional if session_init has set defaults)"),
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional if session_init has set defaults)"),
-        role: external_exports.string().optional().describe('Role of the person being onboarded (e.g., "backend developer", "frontend developer")')
-      }
+      title: `Project Onboarding (${promptAccessLabel("onboard-to-project")})`,
+      description: "Generate onboarding context for a new team member"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Create an onboarding guide for a new team member joining this project.
-${args.role ? `They will be working as a ${args.role}.` : ""}
-
-Please gather comprehensive context:
-1. Use \`projects_overview\` and \`projects_statistics\` for project summary
-2. Use \`projects_files\` to identify key entry points
-3. Use \`memory_timeline\` to see recent activity and changes
-4. Use \`memory_decisions\` to understand key architectural choices
-5. Use \`search_semantic\` to find documentation and READMEs
-
-Provide an onboarding guide that includes:
-- Project overview and purpose
-- Technology stack and architecture
-- Key files and entry points${args.role ? ` relevant to ${args.role}` : ""}
-- Important decisions and their rationale
-- Recent changes and current focus areas
-- Getting started steps`
+            text: [
+              "Create an onboarding guide for a new team member joining this project.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If the role is not specified, ask me what role they are onboarding into (backend, frontend, fullstack, etc.).",
+              "",
+              "Gather context:",
+              "1. Use `projects_overview` and `projects_statistics` for project summary.",
+              "2. Use `projects_files` to identify key entry points.",
+              "3. Use `memory_timeline` and `memory_decisions` to understand recent changes and architectural choices.",
+              "4. Use `search_semantic` to find READMEs/docs/setup instructions.",
+              "",
+              "Output:",
+              "- Project overview and purpose",
+              "- Tech stack + architecture map",
+              "- Key files/entry points relevant to the role",
+              "- Important decisions + rationale",
+              "- Recent changes/current focus",
+              "- Step-by-step getting started"
+            ].join("\n")
           }
         }
       ]
@@ -8399,33 +8647,30 @@ Provide an onboarding guide that includes:
   server.registerPrompt(
     "analyze-refactoring",
     {
-      title: "Refactoring Analysis",
-      description: "Analyze a codebase for refactoring opportunities",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional if session_init has set defaults)"),
-        target_area: external_exports.string().optional().describe("Specific area to analyze")
-      }
+      title: `Refactoring Analysis (${promptAccessLabel("analyze-refactoring")})`,
+      description: "Analyze a codebase for refactoring opportunities"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Analyze the codebase for refactoring opportunities${args.target_area ? ` in ${args.target_area}` : ""}.
-
-Please investigate:
-1. Use \`graph_circular_dependencies\` to find circular dependencies
-2. Use \`graph_unused_code\` to find dead code
-3. Use \`search_pattern\` to find code duplication patterns
-4. Use \`projects_statistics\` to identify complex areas
-
-Provide:
-- Circular dependencies that should be broken
-- Unused code that can be removed
-- Duplicate patterns that could be consolidated
-- High complexity areas that need simplification
-- Prioritized refactoring recommendations`
+            text: [
+              "Analyze the codebase for refactoring opportunities.",
+              "",
+              ...ID_NOTES,
+              "",
+              "If a target area is obvious from our conversation, focus there; otherwise ask me what area to analyze.",
+              "",
+              "Please investigate:",
+              "1. `graph_circular_dependencies` (circular deps to break)",
+              "2. `graph_unused_code` (dead code to remove)",
+              "3. `search_pattern` (duplication patterns)",
+              "4. `projects_statistics` (high complexity hotspots)",
+              "",
+              "Provide a prioritized list with quick wins vs deeper refactors."
+            ].join("\n")
           }
         }
       ]
@@ -8434,34 +8679,30 @@ Provide:
   server.registerPrompt(
     "build-context",
     {
-      title: "Build LLM Context",
-      description: "Build comprehensive context for an LLM task",
-      argsSchema: {
-        query: external_exports.string().describe("What you need context for"),
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID"),
-        include_memory: external_exports.string().optional().describe('Include memory/decisions ("true" or "false")')
-      }
+      title: `Build LLM Context (${promptAccessLabel("build-context")})`,
+      description: "Build comprehensive context for an LLM task"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Build comprehensive context for the following task:
-
-**Query:** ${args.query}
-
-Please use \`ai_enhanced_context\` with:
-- query: "${args.query}"
-${args.workspace_id ? `- workspace_id: "${args.workspace_id}"` : ""}
-${args.project_id ? `- project_id: "${args.project_id}"` : ""}
-- include_code: true
-- include_docs: true
-- include_memory: ${args.include_memory ?? true}
-
-Then synthesize the retrieved context into a coherent briefing that will help with the task.`
+            text: [
+              "Build comprehensive context for the task we are working on.",
+              "",
+              `Access: ${promptAccessLabel("build-context")}${promptAccessLabel("build-context") === "PRO" ? ` (upgrade: ${upgradeUrl})` : ""}`,
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If the \u201Cquery\u201D is clear from the latest user request, use that.",
+              "- Otherwise ask me: \u201CWhat do you need context for?\u201D",
+              "",
+              "Then:",
+              "- Call `ai_enhanced_context` with include_code=true, include_docs=true, include_memory=true (omit IDs unless required).",
+              "- Synthesize the returned context into a short briefing with links/file paths and key decisions/risks."
+            ].join("\n")
           }
         }
       ]
@@ -8470,28 +8711,29 @@ Then synthesize the retrieved context into a coherent briefing that will help wi
   server.registerPrompt(
     "smart-search",
     {
-      title: "Smart Search",
-      description: "Search across memory, decisions, and code for a query",
-      argsSchema: {
-        query: external_exports.string().describe("What you want to find"),
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)")
-      }
+      title: `Smart Search (${promptAccessLabel("smart-search")})`,
+      description: "Search across memory, decisions, and code for a query"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Find the most relevant context for: "${args.query}"
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Please:
-1. Use \`session_smart_search\` with query "${args.query}"${args.workspace_id ? ` and workspace_id "${args.workspace_id}"` : ""}${args.project_id ? ` and project_id "${args.project_id}"` : ""}
-2. If results are thin, follow up with \`search_hybrid\` and \`memory_search\`
-3. Return the top results with file paths/links and a short synthesis of what matters`
+            text: [
+              "Find the most relevant context for what I am asking about.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If a query is clear from the conversation, use it.",
+              "- Otherwise ask me what I want to find.",
+              "",
+              "Then:",
+              "1. Use `session_smart_search` for the query.",
+              "2. If results are thin, follow up with `search_hybrid` and `memory_search`.",
+              "3. Return the top results with file paths/links and a short synthesis."
+            ].join("\n")
           }
         }
       ]
@@ -8500,26 +8742,28 @@ Please:
   server.registerPrompt(
     "recall-context",
     {
-      title: "Recall Context",
-      description: "Retrieve relevant past decisions and memory for a query",
-      argsSchema: {
-        query: external_exports.string().describe("What to recall (natural language)"),
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)")
-      }
+      title: `Recall Context (${promptAccessLabel("recall-context")})`,
+      description: "Retrieve relevant past decisions and memory for a query"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Recall relevant context for: "${args.query}"
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_recall\` with query "${args.query}"${args.workspace_id ? ` and workspace_id "${args.workspace_id}"` : ""}${args.project_id ? ` and project_id "${args.project_id}"` : ""}.
-Then summarize the key points and any relevant decisions/lessons.`
+            text: [
+              "Recall relevant past context (decisions, notes, lessons) for what I am asking about.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If a recall query is clear from the conversation, use it.",
+              "- Otherwise ask me what topic I want to recall.",
+              "",
+              "Then:",
+              "- Use `session_recall` with the query (omit IDs unless required).",
+              "- Summarize the key points and any relevant decisions/lessons."
+            ].join("\n")
           }
         }
       ]
@@ -8528,26 +8772,25 @@ Then summarize the key points and any relevant decisions/lessons.`
   server.registerPrompt(
     "session-summary",
     {
-      title: "Session Summary",
-      description: "Get a compact summary of workspace/project context",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        max_tokens: external_exports.string().optional().describe("Max tokens for summary (default: 500)")
-      }
+      title: `Session Summary (${promptAccessLabel("session-summary")})`,
+      description: "Get a compact summary of workspace/project context"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Generate a compact, token-efficient summary of the current workspace/project context.
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_summary\`${args.workspace_id ? ` with workspace_id "${args.workspace_id}"` : ""}${args.project_id ? ` and project_id "${args.project_id}"` : ""}${args.max_tokens ? ` and max_tokens ${args.max_tokens} (number)` : ""}.
-Then list the top decisions (titles only) and any high-priority lessons to watch for.`
+            text: [
+              "Generate a compact, token-efficient summary of the current workspace/project context.",
+              "",
+              ...ID_NOTES,
+              "",
+              "Use `session_summary` (default max_tokens=500 unless I specify otherwise).",
+              "Then list:",
+              "- Top decisions (titles only)",
+              "- Any high-priority lessons to watch for"
+            ].join("\n")
           }
         }
       ]
@@ -8556,39 +8799,31 @@ Then list the top decisions (titles only) and any high-priority lessons to watch
   server.registerPrompt(
     "capture-lesson",
     {
-      title: "Capture Lesson",
-      description: "Record a lesson learned from an error or correction",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        title: external_exports.string().describe("Lesson title (what to remember)"),
-        severity: external_exports.string().optional().describe("low|medium|high|critical (default: medium)"),
-        category: external_exports.string().describe("workflow|code_quality|verification|communication|project_specific"),
-        trigger: external_exports.string().describe("What action caused the problem"),
-        impact: external_exports.string().describe("What went wrong"),
-        prevention: external_exports.string().describe("How to prevent in future"),
-        keywords: external_exports.string().optional().describe("Comma-separated keywords (optional)")
-      }
+      title: `Capture Lesson (${promptAccessLabel("capture-lesson")})`,
+      description: "Record a lesson learned from an error or correction"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Capture this lesson so it is surfaced in future sessions:
-
-Title: ${args.title}
-Severity: ${args.severity || "medium"}
-Category: ${args.category}
-Trigger: ${args.trigger}
-Impact: ${args.impact}
-Prevention: ${args.prevention}
-${args.keywords ? `Keywords: ${args.keywords}` : ""}
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_capture_lesson\` with the fields above. If keywords were provided, split the comma-separated list into an array of strings.`
+            text: [
+              "Capture a lesson learned so it is surfaced in future sessions.",
+              "",
+              ...ID_NOTES,
+              "",
+              "If the lesson details are not fully present in the conversation, ask me for:",
+              "- title (what to remember)",
+              "- severity (low|medium|high|critical, default medium)",
+              "- category (workflow|code_quality|verification|communication|project_specific)",
+              "- trigger (what caused it)",
+              "- impact (what went wrong)",
+              "- prevention (how to prevent it)",
+              "- keywords (optional)",
+              "",
+              "Then call `session_capture_lesson` with those fields and confirm it was saved."
+            ].join("\n")
           }
         }
       ]
@@ -8597,33 +8832,28 @@ Use \`session_capture_lesson\` with the fields above. If keywords were provided,
   server.registerPrompt(
     "capture-preference",
     {
-      title: "Capture Preference",
-      description: "Save a user preference to memory",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        title: external_exports.string().optional().describe("Preference title (optional)"),
-        preference: external_exports.string().describe("Preference details to remember")
-      }
+      title: `Capture Preference (${promptAccessLabel("capture-preference")})`,
+      description: "Save a user preference to memory"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Save this preference to memory:
-
-${args.title ? `Title: ${args.title}
-` : ""}Preference: ${args.preference}
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_capture\` with:
-- event_type: "preference"
-- title: ${args.title ? `"${args.title}"` : "(choose a short title)"}
-- content: "${args.preference}"
-- importance: "medium"`
+            text: [
+              "Save a user preference to ContextStream memory.",
+              "",
+              ...ID_NOTES,
+              "",
+              "If the preference is not explicit in the conversation, ask me what to remember.",
+              "",
+              "Then call `session_capture` with:",
+              '- event_type: "preference"',
+              "- title: (short title)",
+              "- content: (preference text)",
+              '- importance: "medium"'
+            ].join("\n")
           }
         }
       ]
@@ -8632,33 +8862,28 @@ Use \`session_capture\` with:
   server.registerPrompt(
     "capture-task",
     {
-      title: "Capture Task",
-      description: "Capture an action item into memory",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        title: external_exports.string().optional().describe("Task title (optional)"),
-        task: external_exports.string().describe("Task details")
-      }
+      title: `Capture Task (${promptAccessLabel("capture-task")})`,
+      description: "Capture an action item into memory"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Capture this task in memory for tracking:
-
-${args.title ? `Title: ${args.title}
-` : ""}Task: ${args.task}
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_capture\` with:
-- event_type: "task"
-- title: ${args.title ? `"${args.title}"` : "(choose a short title)"}
-- content: "${args.task}"
-- importance: "medium"`
+            text: [
+              "Capture an action item into ContextStream memory.",
+              "",
+              ...ID_NOTES,
+              "",
+              "If the task is not explicit in the conversation, ask me what to capture.",
+              "",
+              "Then call `session_capture` with:",
+              '- event_type: "task"',
+              "- title: (short title)",
+              "- content: (task details)",
+              '- importance: "medium"'
+            ].join("\n")
           }
         }
       ]
@@ -8667,44 +8892,34 @@ Use \`session_capture\` with:
   server.registerPrompt(
     "capture-bug",
     {
-      title: "Capture Bug",
-      description: "Capture a bug report into workspace memory",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        title: external_exports.string().describe("Bug title"),
-        description: external_exports.string().describe("Bug description"),
-        reproduction_steps: external_exports.string().optional().describe("Steps to reproduce (optional)"),
-        expected: external_exports.string().optional().describe("Expected behavior (optional)"),
-        actual: external_exports.string().optional().describe("Actual behavior (optional)")
-      }
+      title: `Capture Bug (${promptAccessLabel("capture-bug")})`,
+      description: "Capture a bug report into workspace memory"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Capture this bug report in memory:
-
-Title: ${args.title}
-Description: ${args.description}
-${args.reproduction_steps ? `Steps to reproduce:
-${args.reproduction_steps}
-` : ""}${args.expected ? `Expected:
-${args.expected}
-` : ""}${args.actual ? `Actual:
-${args.actual}
-` : ""}
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_capture\` with:
-- event_type: "bug"
-- title: "${args.title}"
-- content: A well-formatted bug report with the details above
-- tags: include relevant component/area tags
-- importance: "high"`
+            text: [
+              "Capture a bug report in ContextStream memory.",
+              "",
+              ...ID_NOTES,
+              "",
+              "If details are missing, ask me for:",
+              "- title",
+              "- description",
+              "- steps to reproduce (optional)",
+              "- expected behavior (optional)",
+              "- actual behavior (optional)",
+              "",
+              "Then call `session_capture` with:",
+              '- event_type: "bug"',
+              "- title: (bug title)",
+              "- content: a well-formatted bug report (include all provided details)",
+              "- tags: component/area tags",
+              '- importance: "high"'
+            ].join("\n")
           }
         }
       ]
@@ -8713,41 +8928,33 @@ Use \`session_capture\` with:
   server.registerPrompt(
     "capture-feature",
     {
-      title: "Capture Feature",
-      description: "Capture a feature request into workspace memory",
-      argsSchema: {
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        title: external_exports.string().describe("Feature title"),
-        description: external_exports.string().describe("Feature description"),
-        rationale: external_exports.string().optional().describe("Why this matters (optional)"),
-        acceptance_criteria: external_exports.string().optional().describe("Acceptance criteria (optional)")
-      }
+      title: `Capture Feature (${promptAccessLabel("capture-feature")})`,
+      description: "Capture a feature request into workspace memory"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Capture this feature request in memory:
-
-Title: ${args.title}
-Description: ${args.description}
-${args.rationale ? `Rationale:
-${args.rationale}
-` : ""}${args.acceptance_criteria ? `Acceptance criteria:
-${args.acceptance_criteria}
-` : ""}
-
-If workspace_id/project_id are not provided, call \`session_init\` first to resolve the current workspace/project.
-
-Use \`session_capture\` with:
-- event_type: "feature"
-- title: "${args.title}"
-- content: A well-formatted feature request with the details above
-- tags: include relevant component/area tags
-- importance: "medium"`
+            text: [
+              "Capture a feature request in ContextStream memory.",
+              "",
+              ...ID_NOTES,
+              "",
+              "If details are missing, ask me for:",
+              "- title",
+              "- description",
+              "- rationale (optional)",
+              "- acceptance criteria (optional)",
+              "",
+              "Then call `session_capture` with:",
+              '- event_type: "feature"',
+              "- title: (feature title)",
+              "- content: a well-formatted feature request",
+              "- tags: component/area tags",
+              '- importance: "medium"'
+            ].join("\n")
           }
         }
       ]
@@ -8756,30 +8963,26 @@ Use \`session_capture\` with:
   server.registerPrompt(
     "generate-plan",
     {
-      title: "Generate Plan",
-      description: "Generate a development plan from a description",
-      argsSchema: {
-        description: external_exports.string().describe("What you want to build/fix"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        complexity: external_exports.string().optional().describe("low|medium|high (optional)")
-      }
+      title: `Generate Plan (${promptAccessLabel("generate-plan")})`,
+      description: "Generate a development plan from a description"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Generate a development plan for:
-
-${args.description}
-
-Use \`ai_plan\` with:
-- description: "${args.description}"
-${args.project_id ? `- project_id: "${args.project_id}"` : ""}
-${args.complexity ? `- complexity: "${args.complexity}"` : ""}
-
-Then present the plan as a concise ordered list with clear milestones and risks.`
+            text: [
+              "Generate a development plan for what I am trying to build/fix.",
+              "",
+              `Access: ${promptAccessLabel("generate-plan")}${promptAccessLabel("generate-plan") === "PRO" ? ` (upgrade: ${upgradeUrl})` : ""}`,
+              "",
+              ...ID_NOTES,
+              "",
+              "Use the most recent user request as the plan description. If unclear, ask me for a one-paragraph description.",
+              "",
+              "Then call `ai_plan` and present the plan as an ordered list with milestones and risks."
+            ].join("\n")
           }
         }
       ]
@@ -8788,31 +8991,27 @@ Then present the plan as a concise ordered list with clear milestones and risks.
   server.registerPrompt(
     "generate-tasks",
     {
-      title: "Generate Tasks",
-      description: "Generate actionable tasks from a plan or description",
-      argsSchema: {
-        plan_id: external_exports.string().optional().describe("Plan ID (optional)"),
-        description: external_exports.string().optional().describe("Description to generate tasks from (optional if plan_id provided)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        granularity: external_exports.string().optional().describe("fine|medium|coarse (optional)")
-      }
+      title: `Generate Tasks (${promptAccessLabel("generate-tasks")})`,
+      description: "Generate actionable tasks from a plan or description"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Generate actionable tasks.
-
-${args.plan_id ? `Use plan_id: ${args.plan_id}` : ""}${!args.plan_id && args.description ? `Use description: ${args.description}` : ""}
-
-Use \`ai_tasks\` with:
-${args.plan_id ? `- plan_id: "${args.plan_id}"` : ""}${!args.plan_id && args.description ? `- description: "${args.description}"` : ""}
-${args.project_id ? `- project_id: "${args.project_id}"` : ""}
-${args.granularity ? `- granularity: "${args.granularity}"` : ""}
-
-Then output a checklist of tasks with clear acceptance criteria for each.`
+            text: [
+              "Generate actionable tasks for the work we are discussing.",
+              "",
+              `Access: ${promptAccessLabel("generate-tasks")}${promptAccessLabel("generate-tasks") === "PRO" ? ` (upgrade: ${upgradeUrl})` : ""}`,
+              "",
+              ...ID_NOTES,
+              "",
+              "If a plan_id exists in the conversation, use it. Otherwise use the latest user request as the description.",
+              "If granularity is not specified, default to medium.",
+              "",
+              "Call `ai_tasks` and return a checklist of tasks with acceptance criteria for each."
+            ].join("\n")
           }
         }
       ]
@@ -8821,35 +9020,28 @@ Then output a checklist of tasks with clear acceptance criteria for each.`
   server.registerPrompt(
     "token-budget-context",
     {
-      title: "Token-Budget Context",
-      description: "Get the most relevant context that fits within a token budget",
-      argsSchema: {
-        query: external_exports.string().describe("What you need context for"),
-        max_tokens: external_exports.string().describe("Max tokens for context (e.g., 500, 1000, 2000)"),
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        include_code: external_exports.string().optional().describe('Include code ("true" or "false")')
-      }
+      title: `Token-Budget Context (${promptAccessLabel("token-budget-context")})`,
+      description: "Get the most relevant context that fits within a token budget"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Build the most relevant context for:
-
-Query: ${args.query}
-Token budget: ${args.max_tokens}
-
-Use \`ai_context_budget\` with:
-- query: "${args.query}"
-- max_tokens: ${args.max_tokens} (number)
-${args.workspace_id ? `- workspace_id: "${args.workspace_id}"` : ""}
-${args.project_id ? `- project_id: "${args.project_id}"` : ""}
-${args.include_code ? `- include_code: ${args.include_code}` : ""}
-
-Return the packed context plus a short note about what was included/excluded.`
+            text: [
+              "Build the most relevant context that fits within a token budget.",
+              "",
+              `Access: ${promptAccessLabel("token-budget-context")}${promptAccessLabel("token-budget-context") === "PRO" ? ` (upgrade: ${upgradeUrl})` : ""}`,
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If a query is clear from the conversation, use it; otherwise ask me for a query.",
+              "- If max_tokens is not specified, ask me for a token budget (e.g., 500/1000/2000).",
+              "",
+              "Then call `ai_context_budget` and return the packed context plus a short note about what was included/excluded."
+            ].join("\n")
           }
         }
       ]
@@ -8858,25 +9050,23 @@ Return the packed context plus a short note about what was included/excluded.`
   server.registerPrompt(
     "find-todos",
     {
-      title: "Find TODOs",
-      description: "Scan the codebase for TODO/FIXME/HACK notes and summarize",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional)"),
-        pattern: external_exports.string().optional().describe("Regex/pattern to search (default: TODO|FIXME|HACK)")
-      }
+      title: `Find TODOs (${promptAccessLabel("find-todos")})`,
+      description: "Scan the codebase for TODO/FIXME/HACK notes and summarize"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Find TODO-style notes in the codebase.
-
-If project_id is not provided, first call \`session_init\` (or \`projects_list\`) to resolve the current project ID.
-
-Use \`search_pattern\` with query "${args.pattern || "TODO|FIXME|HACK"}"${args.project_id ? ` and project_id "${args.project_id}"` : ""}.
-Group results by file path, summarize themes, and propose a small prioritized cleanup list.`
+            text: [
+              "Scan the codebase for TODO/FIXME/HACK notes and summarize them.",
+              "",
+              ...ID_NOTES,
+              "",
+              "Use `search_pattern` with query `TODO|FIXME|HACK` (or a pattern inferred from the conversation).",
+              "Group results by file path, summarize themes, and propose a small prioritized cleanup list."
+            ].join("\n")
           }
         }
       ]
@@ -8885,36 +9075,27 @@ Group results by file path, summarize themes, and propose a small prioritized cl
   server.registerPrompt(
     "generate-editor-rules",
     {
-      title: "Generate Editor Rules",
-      description: "Generate ContextStream AI rule files for your editor",
-      argsSchema: {
-        folder_path: external_exports.string().describe("Project folder path (ideally absolute)"),
-        editors: external_exports.string().optional().describe('Comma-separated editors or "all" (windsurf,cursor,cline,kilo,roo,claude,aider)'),
-        workspace_id: external_exports.string().uuid().optional().describe("Workspace ID (optional)"),
-        workspace_name: external_exports.string().optional().describe("Workspace name (optional)"),
-        project_name: external_exports.string().optional().describe("Project name (optional)"),
-        additional_rules: external_exports.string().optional().describe("Additional project-specific rules (optional)"),
-        dry_run: external_exports.string().optional().describe('Dry run ("true" or "false", default: false)')
-      }
+      title: `Generate Editor Rules (${promptAccessLabel("generate-editor-rules")})`,
+      description: "Generate ContextStream AI rule files for your editor"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Generate ContextStream editor rule files in: ${args.folder_path}
-
-Use \`generate_editor_rules\` with:
-- folder_path: "${args.folder_path}"
-${args.editors ? `- editors: "${args.editors}"` : ""}
-${args.workspace_id ? `- workspace_id: "${args.workspace_id}"` : ""}
-${args.workspace_name ? `- workspace_name: "${args.workspace_name}"` : ""}
-${args.project_name ? `- project_name: "${args.project_name}"` : ""}
-${args.additional_rules ? `- additional_rules: "${args.additional_rules}"` : ""}
-${args.dry_run ? `- dry_run: ${args.dry_run}` : ""}
-
-If editors is provided as a comma-separated string, split it into an array (or use ["all"] to generate for all editors). If dry_run is provided as a string, convert to boolean.`
+            text: [
+              "Generate ContextStream AI rule files for my editor.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- If you can infer the project folder path from the environment/IDE roots, use it.",
+              "- Otherwise ask me for an absolute folder path.",
+              "- Ask which editor(s) (windsurf,cursor,cline,kilo,roo,claude,aider) or default to all.",
+              "",
+              "Then call `generate_editor_rules` and confirm which files were created/updated."
+            ].join("\n")
           }
         }
       ]
@@ -8923,30 +9104,27 @@ If editors is provided as a comma-separated string, split it into an array (or u
   server.registerPrompt(
     "index-local-repo",
     {
-      title: "Index Local Repo",
-      description: "Ingest local files into ContextStream for indexing/search",
-      argsSchema: {
-        project_id: external_exports.string().uuid().optional().describe("Project ID (optional if session_init has set defaults)"),
-        path: external_exports.string().describe("Local directory path to ingest")
-      }
+      title: `Index Local Repo (${promptAccessLabel("index-local-repo")})`,
+      description: "Ingest local files into ContextStream for indexing/search"
     },
-    async (args) => ({
+    async () => ({
       messages: [
         {
           role: "user",
           content: {
             type: "text",
-            text: `Ingest local files for indexing/search.
-
-Path: ${args.path}
-
-If project_id is not provided, call \`session_init\` first and use the resolved project_id (or use \`projects_list\` to select).
-
-Use \`projects_ingest_local\` with:
-- project_id: ${args.project_id ? `"${args.project_id}"` : "(resolved from session_init)"}
-- path: "${args.path}"
-
-Then advise how to monitor progress via \`projects_index_status\`.`
+            text: [
+              "Ingest local files into ContextStream for indexing/search.",
+              "",
+              ...ID_NOTES,
+              "",
+              "First:",
+              "- Ask me for the local directory path to ingest if it is not already specified.",
+              "",
+              "Then:",
+              "- Call `projects_ingest_local` with the path (use session defaults for project, or the `project_id` returned by `session_init`).",
+              "- Explain how to monitor progress via `projects_index_status`."
+            ].join("\n")
           }
         }
       ]
@@ -9127,6 +9305,25 @@ var SessionManager = class {
     parts.push("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
     parts.push("\u{1F9E0} AUTO-CONTEXT LOADED (ContextStream)");
     parts.push("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+    if (context.status === "requires_workspace_name") {
+      parts.push("");
+      parts.push("\u26A0\uFE0F  NO WORKSPACE FOUND");
+      parts.push(`Folder: ${context.folder_name || "unknown"}`);
+      parts.push("");
+      parts.push("Please ask the user for a name for the new workspace.");
+      parts.push("Then create a project for this folder.");
+      parts.push("");
+      parts.push("Recommended: call `workspace_bootstrap` with:");
+      if (typeof context.folder_path === "string") {
+        parts.push(`  - folder_path: ${context.folder_path}`);
+      } else {
+        parts.push("  - folder_path: (your repo folder path)");
+      }
+      parts.push('  - workspace_name: "<user-provided name>"');
+      parts.push("");
+      parts.push("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
+      return parts.join("\n");
+    }
     if (context.status === "requires_workspace_selection") {
       parts.push("");
       parts.push("\u26A0\uFE0F  NEW FOLDER DETECTED");
@@ -9260,6 +9457,8 @@ Environment variables:
   CONTEXTSTREAM_JWT       JWT for authentication (alternative to API key)
   CONTEXTSTREAM_WORKSPACE_ID  Optional default workspace ID
   CONTEXTSTREAM_PROJECT_ID    Optional default project ID
+  CONTEXTSTREAM_PRO_TOOLS     Optional comma-separated PRO tool names (default: AI tools)
+  CONTEXTSTREAM_UPGRADE_URL   Optional upgrade URL shown for PRO tools on Free plan
 
 Examples:
   CONTEXTSTREAM_API_URL="https://api.contextstream.io" \\