spacecode 2.4.1 → 2.5.0

package/dist/repl.mjs

@@ -5325,28 +5325,41 @@ function applyPlan(input, decisions, maxCoreChars = MAX_CORE_CHARS) {
   }
   const missing = input.sections.filter((s) => !seen.has(s.slug)).map((s) => s.slug);
   if (missing.length > 0) throw new AdaptPlanError(`plan does not decide section(s): ${missing.join(", ")}`);
-  const kept = [];
-  const onDemand = [];
-  const dropped = [];
-  const index = [];
-  for (const d of decisions) {
-    const s = bySlug.get(d.slug);
-    if (d.decision === "keep") kept.push(s.text);
-    else if (d.decision === "on_demand") {
-      onDemand.push({ slug: s.slug, title: s.title, text: s.text });
-      index.push(`- ${s.slug}: ${s.title} \u2014 ${d.summary.trim().replace(/\s+/g, " ")}`);
-    } else dropped.push({ slug: s.slug, title: s.title, reason: d.reason.trim(), unsupported: s.unsupported });
-  }
-  const indexBlock = index.length > 0 ? `
+  const keptSlugs = new Set(decisions.filter((d) => d.decision === "keep").map((d) => d.slug));
+  const summaries = new Map(decisions.map((d) => [d.slug, d.summary?.trim().replace(/\s+/g, " ") ?? ""]));
+  const demoted = [];
+  const assemble = () => {
+    const kept = [];
+    const onDemand2 = [];
+    const dropped2 = [];
+    const index = [];
+    for (const d of decisions) {
+      const s = bySlug.get(d.slug);
+      if (keptSlugs.has(d.slug)) kept.push(s.text);
+      else if (d.decision === "drop") dropped2.push({ slug: s.slug, title: s.title, reason: d.reason.trim(), unsupported: s.unsupported });
+      else {
+        onDemand2.push({ slug: s.slug, title: s.title, text: s.text });
+        index.push(`- ${s.slug}: ${s.title} \u2014 ${summaries.get(s.slug) || `read when working on: ${s.title}`}`);
+      }
+    }
+    const indexBlock = index.length > 0 ? `
 ## More instructions (on demand)
 Use the instructions_read tool with a section name to read one before acting in that area:
 ${index.join("\n")}
 ` : "";
-  const core = input.preamble + kept.join("") + indexBlock;
-  if (core.length > maxCoreChars) throw new AdaptPlanError(`core is ${core.length} chars, over the ${maxCoreChars} budget: demote larger sections to on_demand`);
+    return { core: input.preamble + kept.join("") + indexBlock, onDemand: onDemand2, dropped: dropped2 };
+  };
+  let { core, onDemand, dropped } = assemble();
+  while (core.length > maxCoreChars && keptSlugs.size > 0) {
+    const largest = [...keptSlugs].map((slug) => bySlug.get(slug)).sort((a, b2) => b2.chars - a.chars)[0];
+    keptSlugs.delete(largest.slug);
+    demoted.push({ slug: largest.slug, title: largest.title });
+    ({ core, onDemand, dropped } = assemble());
+  }
+  if (core.length > maxCoreChars) throw new AdaptPlanError(`core is ${core.length} chars, over the ${maxCoreChars} budget even with every section on demand`);
   const translated = input.preamble + input.sections.map((s) => s.text).join("");
   const coverage = checkCoverage(translated, [core, ...onDemand.map((o) => o.text)], dropped.map((d) => bySlug.get(d.slug).text));
-  return { core, onDemand, dropped, coverage, coreChars: core.length };
+  return { core, onDemand, dropped, coverage, coreChars: core.length, demoted };
 }
 var AdaptPlanError, MAX_CORE_CHARS;
 var init_adapt_plan = __esm({
@@ -5558,6 +5571,7 @@ async function sha12(text) {
 function formatAdaptReport(r, before, replaced) {
   const lines2 = [`Adapted instructions: ${before} chars -> core ${r.coreChars} chars + ${r.onDemand.length} on-demand section(s), ${r.dropped.length} dropped.`];
   for (const x2 of replaced) lines2.push(`  tool name  ${x2.from} -> ${x2.to} (${x2.count}x)`);
+  for (const d of r.demoted) lines2.push(`  demoted    ${d.slug}: kept by the model but moved on demand to fit the core budget`);
   for (const o of r.onDemand) lines2.push(`  on demand  ${o.slug}  (${o.text.length} chars)`);
   for (const d of r.dropped) lines2.push(`  DROPPED    ${d.slug}: ${d.reason}${d.unsupported.length ? `  [${d.unsupported.join("; ")}]` : ""}`);
   if (r.coverage.droppedRules.length > 0) {
@@ -5649,7 +5663,7 @@ __export(import_claude_exports, {
 });
 async function runImportClaude(deps) {
   const flags = deps.argv.filter((a) => a !== "import-claude");
-  const unknown = flags.filter((f) => !["--dry-run", "--overwrite", "--adapt", "--yes", "--restore-original"].includes(f));
+  const unknown = flags.filter((f) => !["--dry-run", "--overwrite", "--adapt", "--no-adapt", "--yes", "--restore-original"].includes(f));
   if (unknown.length > 0) {
     deps.log(`Unknown option: ${unknown.join(" ")}
 ${USAGE}`);
@@ -5657,9 +5671,9 @@ ${USAGE}`);
   }
   const dryRun = flags.includes("--dry-run");
   const overwrite = flags.includes("--overwrite");
-  const adapt = flags.includes("--adapt");
+  const adapt = !flags.includes("--no-adapt");
   const restore = flags.includes("--restore-original");
-  if (restore && (adapt || dryRun)) {
+  if (restore && (flags.includes("--adapt") || dryRun)) {
     deps.log(`--restore-original cannot be combined with --adapt or --dry-run
 ${USAGE}`);
     return 2;
@@ -5745,7 +5759,7 @@ var init_import_claude = __esm({
     init_api_key();
     init_profile_runtime();
     init_import_adapt();
-    USAGE = "Usage: spacecode import-claude [--dry-run] [--overwrite] [--adapt [--yes]] [--restore-original]";
+    USAGE = "Usage: spacecode import-claude [--dry-run] [--overwrite] [--no-adapt] [--yes] [--restore-original]";
   }
 });
 

package/package.json

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