@contextstream/mcp-server 0.3.23 → 0.3.25

package/dist/index.js

@@ -5112,6 +5112,38 @@ var ContextStreamClient = class {
         context.workspace_error = String(e);
       }
     }
+    if (!workspaceId && !params.allow_no_workspace) {
+      const folderDisplayName = rootPath?.split("/").pop() || "this folder";
+      context.ide_roots = ideRoots;
+      context.folder_name = folderDisplayName;
+      if (rootPath) {
+        context.folder_path = rootPath;
+      }
+      context.suggested_project_name = folderDisplayName;
+      try {
+        const workspaces = await this.listWorkspaces({ page_size: 50 });
+        const items = Array.isArray(workspaces.items) ? workspaces.items : [];
+        if (items.length > 0) {
+          context.status = "requires_workspace_selection";
+          context.workspace_candidates = items.map((w) => ({
+            id: w.id,
+            name: w.name,
+            description: w.description
+          }));
+          context.message = `This folder is not associated with a workspace yet. Please select which workspace to use, or create a new one.`;
+          return context;
+        }
+        context.status = "requires_workspace_name";
+        context.workspace_source = "none_found";
+        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.status = "requires_workspace_selection";
+        context.workspace_error = String(e);
+        context.message = `Unable to resolve a workspace automatically (${String(e)}). Please provide workspace_id, or create one with workspace_bootstrap.`;
+        return context;
+      }
+    }
     if (!projectId && workspaceId && rootPath && params.auto_index !== false) {
       const projectName = rootPath.split("/").pop() || "My Project";
       try {
@@ -5181,6 +5213,9 @@ var ContextStreamClient = class {
     context.workspace_name = workspaceName;
     context.project_id = projectId;
     context.ide_roots = ideRoots;
+    if (!workspaceId) {
+      context.workspace_warning = "No workspace was resolved for this session. Workspace-level tools (memory/search/graph) may not work until you associate this folder with a workspace.";
+    }
     if (workspaceId) {
       try {
         const batchedContext = await this._fetchSessionContextBatched({
@@ -7495,7 +7530,8 @@ This does semantic search on the first message. You only need context_smart on s
         context_hint: external_exports.string().optional().describe("RECOMMENDED: Pass the user's first message here for semantic search. This finds relevant context from ANY time, not just recent items."),
         include_recent_memory: external_exports.boolean().optional().describe("Include recent memory events (default: true)"),
         include_decisions: external_exports.boolean().optional().describe("Include recent decisions (default: true)"),
-        auto_index: external_exports.boolean().optional().describe("Automatically create and index project from IDE workspace (default: true)")
+        auto_index: external_exports.boolean().optional().describe("Automatically create and index project from IDE workspace (default: true)"),
+        allow_no_workspace: external_exports.boolean().optional().describe("If true, allow session_init to return connected even if no workspace is resolved (workspace-level tools may not work).")
       })
     },
     async (input) => {
@@ -7514,7 +7550,56 @@ This does semantic search on the first message. You only need context_smart on s
       if (sessionManager) {
         sessionManager.markInitialized(result);
       }
-      return { content: [{ type: "text", text: formatContent(result) }], structuredContent: toStructured(result) };
+      const status = typeof result.status === "string" ? result.status : "";
+      const workspaceWarning = typeof result.workspace_warning === "string" ? result.workspace_warning : "";
+      let text = formatContent(result);
+      if (status === "requires_workspace_name") {
+        const folderPath = typeof result.folder_path === "string" ? result.folder_path : typeof input.folder_path === "string" ? input.folder_path : "";
+        text = [
+          "Action required: no workspaces found for this account.",
+          "Ask the user for a name for the new workspace (recommended), then run `workspace_bootstrap`.",
+          folderPath ? `Recommended: workspace_bootstrap(workspace_name: "<name>", folder_path: "${folderPath}")` : 'Recommended: workspace_bootstrap(workspace_name: "<name>", folder_path: "<your repo folder>")',
+          "",
+          "If you want to continue without a workspace for now, re-run:",
+          folderPath ? `  session_init(folder_path: "${folderPath}", allow_no_workspace: true)` : '  session_init(folder_path: "<your repo folder>", allow_no_workspace: true)',
+          "",
+          "--- Raw Response ---",
+          "",
+          formatContent(result)
+        ].join("\n");
+      } else if (status === "requires_workspace_selection") {
+        const folderName = typeof result.folder_name === "string" ? result.folder_name : typeof input.folder_path === "string" ? input.folder_path.split("/").pop() || "this folder" : "this folder";
+        const candidates = Array.isArray(result.workspace_candidates) ? result.workspace_candidates : [];
+        const lines = [];
+        lines.push(`Action required: select a workspace for "${folderName}" (or create a new one).`);
+        if (candidates.length > 0) {
+          lines.push("");
+          lines.push("Available workspaces:");
+          candidates.slice(0, 25).forEach((w, i) => {
+            const name = w.name || "Untitled";
+            const id = w.id ? ` (${w.id})` : "";
+            const desc = w.description ? ` - ${w.description}` : "";
+            lines.push(`  ${i + 1}. ${name}${id}${desc}`);
+          });
+        }
+        lines.push("");
+        lines.push("Then run `workspace_associate` with the selected workspace_id and your folder_path.");
+        lines.push("");
+        lines.push("If you want to continue without a workspace for now, re-run:");
+        if (typeof input.folder_path === "string" && input.folder_path) {
+          lines.push(`  session_init(folder_path: "${input.folder_path}", allow_no_workspace: true)`);
+        } else {
+          lines.push('  session_init(folder_path: "<your repo folder>", allow_no_workspace: true)');
+        }
+        lines.push("");
+        lines.push("--- Raw Response ---");
+        lines.push("");
+        lines.push(formatContent(result));
+        text = lines.join("\n");
+      } else if (workspaceWarning) {
+        text = [`Warning: ${workspaceWarning}`, "", formatContent(result)].join("\n");
+      }
+      return { content: [{ type: "text", text }], structuredContent: toStructured(result) };
     }
   );
   registerTool(
@@ -9338,7 +9423,7 @@ var SessionManager = class {
       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("Please ask the user for a name for the new workspace (recommended).");
       parts.push("Then create a project for this folder.");
       parts.push("");
       parts.push("Recommended: call `workspace_bootstrap` with:");
@@ -9349,6 +9434,9 @@ var SessionManager = class {
       }
       parts.push('  - workspace_name: "<user-provided name>"');
       parts.push("");
+      parts.push("To continue without a workspace for now:");
+      parts.push("  - call `session_init` again with `allow_no_workspace: true`");
+      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");
     }
@@ -9367,6 +9455,9 @@ var SessionManager = class {
       parts.push("  \u2022 Or create a new workspace");
       parts.push("");
       parts.push("Use workspace_associate tool after user selects.");
+      parts.push("");
+      parts.push("To continue without a workspace for now:");
+      parts.push("  - call `session_init` again with `allow_no_workspace: true`");
       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");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contextstream/mcp-server",
-  "version": "0.3.23",
+  "version": "0.3.25",
   "description": "MCP server exposing ContextStream public API - code context, memory, search, and AI tools for developers",
   "type": "module",
   "license": "MIT",