spacecode 2.12.5 → 2.12.7

package/dist/repl.mjs

@@ -8465,15 +8465,26 @@ var init_mcp_manager = __esm({
 });
 
 // src/mcp/approve-mcp.ts
+function unsetVars(d, env3) {
+  const texts = d.transport === "http" ? [d.url, ...Object.values(d.env)] : [d.command, ...d.args, ...Object.values(d.env)];
+  return [...new Set(texts.flatMap((t) => expandRefs(t, env3).missing))].sort();
+}
 async function runApproveMcp(deps) {
   const { defs, statusLines } = await loadMcpDefs(deps);
   if (!deps.quiet) for (const l of statusLines) deps.log(l);
   const stdio = defs;
-  const todo = [];
+  let todo = [];
   for (const d of stdio) {
     const key = approvalKey(d);
     if (await deps.trust.stdioStatus(key) === "unapproved") todo.push(d);
   }
+  if (deps.quiet && deps.procEnv && todo.length > 0) {
+    const env3 = deps.procEnv;
+    const ready = todo.filter((d) => unsetVars(d, env3).length === 0);
+    const waiting = todo.length - ready.length;
+    if (waiting > 0) deps.log(`${waiting} imported MCP server(s) wait for environment variables (see \`spacecode approve-mcp\`); they are not asked about until those are set.`);
+    todo = ready;
+  }
   if (todo.length === 0) {
     if (!deps.quiet) deps.log(stdio.length === 0 ? "No stdio MCP servers to approve." : "Every stdio MCP server is already approved on this machine.");
     return 0;
@@ -8482,6 +8493,13 @@ async function runApproveMcp(deps) {
     deps.log(`${todo.length} MCP server(s) need approval, but this is not an interactive terminal: nothing was approved.`);
     return 1;
   }
+  if (deps.quiet && todo.length > STARTUP_PROMPT_LIMIT) {
+    const answer = (await deps.ask(`${todo.length} imported MCP servers can be approved now. Review them one by one? [y/N] `) ?? "").trim().toLowerCase();
+    if (answer !== "y" && answer !== "yes") {
+      deps.log("Skipped. Run `spacecode approve-mcp` when you want to review them; nothing spawns until then.");
+      return 0;
+    }
+  }
   if (deps.quiet) deps.log(`
 ${todo.length} imported MCP server(s) want to run a command on this machine. Nothing spawns until you approve it (you can also run \`spacecode approve-mcp\` later).`);
   let approved = 0;
@@ -8506,12 +8524,14 @@ MCP server ${show(d.name)} (${d.origin} definition) wants to run on this machine
 ${approved} of ${todo.length} approved.`);
   return 0;
 }
-var show;
+var STARTUP_PROMPT_LIMIT, show;
 var init_approve_mcp = __esm({
   "src/mcp/approve-mcp.ts"() {
     "use strict";
+    init_src();
     init_mcp_loader();
     init_mcp_manager();
+    STARTUP_PROMPT_LIMIT = 3;
     show = (s) => JSON.stringify(s);
   }
 });
@@ -8545,7 +8565,8 @@ async function runApproveMcpOnNode(opts) {
         }
       } } : {},
       log: (line) => console.log(line),
-      quiet: opts.quiet
+      quiet: opts.quiet,
+      procEnv: process.env
     });
   } finally {
     rl?.close();
@@ -104580,12 +104601,18 @@ var init_import_reload = __esm({
 
 // src/command-loader.ts
 import { join as join14 } from "node:path";
-async function userCommands(deps, lines2) {
+function skillCommandBody(name) {
+  return `Run the imported skill "${name}": call the skill tool with name "${name}" and follow its instructions.
+
+Arguments (may be empty): $ARGUMENTS`;
+}
+async function userCommands(deps, lines2, includeSkills) {
+  const skillNames = /* @__PURE__ */ new Set();
   try {
     const apiKey = await resolveApiKey({ env: deps.env, readFile: deps.readFile, homedir: deps.homedir });
     if (!apiKey) {
       lines2.push("commands: user commands NOT loaded (not signed in)");
-      return [];
+      return { defs: [], skillNames };
     }
     const client = createProfileClient({ baseUrl: backendUrl(deps.env), apiKey, fetch: deps.fetch, timeoutMs: 3e3 });
     const index = await client.index();
@@ -104601,10 +104628,24 @@ async function userCommands(deps, lines2) {
         }
       })
     );
-    return defs;
+    if (includeSkills) {
+      const taken = /* @__PURE__ */ new Set([...defs.map((d) => d.name.toLowerCase()), ...deps.builtins.map((b2) => b2.toLowerCase())]);
+      let hidden = 0;
+      for (const a of index?.assets ?? []) {
+        if (a.kind !== "skill" || (a.description ?? "").startsWith("file:")) continue;
+        if (taken.has(a.name.toLowerCase())) {
+          hidden++;
+          continue;
+        }
+        skillNames.add(a.name.toLowerCase());
+        defs.push({ name: a.name, description: a.description ?? "", body: skillCommandBody(a.name) });
+      }
+      if (hidden > 0) lines2.push(`commands: ${hidden} skill(s) not offered as /name (a command or built-in has that name)`);
+    }
+    return { defs, skillNames };
   } catch (err) {
     lines2.push(`commands: user commands NOT loaded (${err instanceof Error ? err.message : String(err)})`);
-    return [];
+    return { defs: [], skillNames };
   }
 }
 async function repoCommands(deps, lines2) {
@@ -104635,6 +104676,7 @@ async function repoCommands(deps, lines2) {
 }
 async function loadCommands(deps) {
   const configPath = join14(deps.configDir, "imports.json");
+  let skillsOn = false;
   try {
     const loaded = parseImportsConfig(await deps.readFile(configPath).catch((err) => {
       if (err.code === "ENOENT") return null;
@@ -104642,15 +104684,17 @@ async function loadCommands(deps) {
     }), configPath);
     if (loaded.error) return off("commands: off (imports.json unreadable)");
     if (!loaded.config.categories.commands) return off("commands: off (imports.json has commands off)");
+    skillsOn = loaded.config.categories.skills;
   } catch (err) {
     return off(`commands: off (imports.json not read: ${err instanceof Error ? err.message : String(err)})`);
   }
   const lines2 = [];
-  const [user, repo] = await Promise.all([userCommands(deps, lines2), repoCommands(deps, lines2)]);
+  const [{ defs: user, skillNames }, repo] = await Promise.all([userCommands(deps, lines2, skillsOn), repoCommands(deps, lines2)]);
   const reg = buildCommandRegistry({ builtins: deps.builtins, user, repo });
-  const nUser = reg.commands.filter((c) => c.scope === "user").length;
-  const nRepo = reg.commands.length - nUser;
-  lines2.unshift(`commands: ${nUser} user, ${nRepo} repo${reg.shadowed.length ? `; repo shadows user: ${reg.shadowed.map((n) => "/" + n).join(", ")}` : ""}`);
+  const nSkill = reg.commands.filter((c) => c.scope === "user" && skillNames.has(c.name)).length;
+  const nUser = reg.commands.filter((c) => c.scope === "user").length - nSkill;
+  const nRepo = reg.commands.length - nUser - nSkill;
+  lines2.unshift(`commands: ${nUser} user, ${nRepo} repo${nSkill ? `, ${nSkill} from skills` : ""}${reg.shadowed.length ? `; repo shadows user: ${reg.shadowed.map((n) => "/" + n).join(", ")}` : ""}`);
   for (const s of reg.skipped) lines2.push(`commands: skipped [${s.scope}] /${s.name} (${s.reason})`);
   return { commands: reg.commands, statusLines: lines2 };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacecode",
-  "version": "2.12.5",
+  "version": "2.12.7",
   "description": "SpaceCode - launch cloud dev environments with AI coding agents",
   "license": "MIT",
   "type": "commonjs",