ctx-switch 2.0.6 → 2.0.7

package/dist/index.mjs

@@ -32,6 +32,8 @@ function parseArgs(argv) {
     refine: false,
     help: false,
     version: false,
+    pickUser: false,
+    fromUser: null,
     session: null,
     model: null,
     provider: "openrouter",
@@ -59,6 +61,12 @@ function parseArgs(argv) {
       case "--refine":
         options.refine = true;
         break;
+      case "--pick-user":
+        options.pickUser = true;
+        break;
+      case "--from-user":
+        options.fromUser = Number(requireValue(arg, args));
+        break;
       case "--session":
         options.session = requireValue(arg, args);
         break;
@@ -122,6 +130,9 @@ function parseArgs(argv) {
   if (!Number.isInteger(options.limit) || options.limit <= 0) {
     throw new Error(`Invalid limit "${options.limit}". Expected a positive integer.`);
   }
+  if (options.fromUser !== null && (!Number.isInteger(options.fromUser) || options.fromUser <= 0)) {
+    throw new Error(`Invalid --from-user value "${options.fromUser}". Expected a positive integer.`);
+  }
   return options;
 }
 function getHelpText({ name, version }) {
@@ -142,6 +153,8 @@ function getHelpText({ name, version }) {
     "  -o, --output <file>     Write the final prompt to a file",
     "      --source <name>     Session source: claude, codex, opencode (interactive if omitted)",
     "      --session <id|path> Use a specific session file or session id",
+    "      --pick-user         Interactively choose the starting user prompt for preserved context",
+    "      --from-user <n>     Start preserved context from the nth substantive user prompt",
     "      --target <name>     Prompt target: generic, claude, codex, cursor, chatgpt",
     "  -n, --limit <count>     Limit rows for the sessions command (default: 10)",
     "",
@@ -163,6 +176,8 @@ function getHelpText({ name, version }) {
     `  ${name} --source codex --target claude`,
     `  ${name} --source codex --target codex`,
     `  ${name} --source opencode`,
+    `  ${name} --pick-user`,
+    `  ${name} --from-user 2`,
     `  ${name} --refine --model openrouter/free`,
     `  ${name} --output ./handoff.md`,
     `  ${name} doctor`,
@@ -1322,6 +1337,10 @@ function compactText(text, maxChars = 800) {
 function unique(list) {
   return [...new Set(list.filter(Boolean))];
 }
+function isLocalCommandMarkup(text) {
+  const trimmed = text.trim().toLowerCase();
+  return trimmed.includes("<local-command-caveat>") || trimmed.includes("<command-name>") || trimmed.includes("<command-message>") || trimmed.includes("<command-args>") || trimmed.includes("<local-command-stdout>");
+}
 function extractFilePath2(input) {
   const value = input.file_path || input.path || input.target_file || input.filePath;
   return typeof value === "string" ? value : null;
@@ -1330,6 +1349,9 @@ function extractCommand2(input) {
   const value = input.command || input.cmd;
   return typeof value === "string" ? value : null;
 }
+function getSubstantiveUserIndexes(messages) {
+  return messages.map((message, index) => ({ message, index })).filter(({ message }) => message.role === "user" && message.content && !isNoiseMessage(message.content)).map(({ index }) => index);
+}
 function buildTargetGuidance(target) {
   switch (target) {
     case "claude":
@@ -1346,6 +1368,7 @@ function buildTargetGuidance(target) {
 }
 function isNoiseMessage(text) {
   const trimmed = text.trim().toLowerCase();
+  if (isLocalCommandMarkup(trimmed)) return true;
   const normalized = trimmed.replace(/[^\p{L}\p{N}\s]/gu, " ").replace(/\s+/g, " ").trim();
   if (trimmed.length < 5) return true;
   const noise = [
@@ -1376,6 +1399,12 @@ function isNoiseMessage(text) {
   if (trimmed.startsWith("[request interrupted")) return true;
   return false;
 }
+function isAssistantNoiseMessage(text) {
+  const trimmed = text.trim().toLowerCase();
+  if (!trimmed) return true;
+  if (isLocalCommandMarkup(trimmed)) return true;
+  return trimmed.includes("you're out of extra usage") || trimmed.includes("resets 3:30pm") || trimmed.includes("rate limit") || trimmed.includes("login interrupted");
+}
 function isReferentialMessage(text) {
   const normalized = text.trim().toLowerCase().replace(/[^\p{L}\p{N}\s]/gu, " ").replace(/\s+/g, " ").trim();
   if (!normalized || normalized.length > 220) return false;
@@ -1386,11 +1415,11 @@ function isMetaQualityAssistantMessage(text) {
   return /\b(handoff|prompt)\b/.test(lower) && /\b(good|bad|better|worse|quality)\b/.test(lower);
 }
 function filterUserMessages(messages) {
-  const all = messages.filter((m) => m.role === "user" && m.content).map((m) => m.content.trim());
+  const all = messages.filter((m) => m.role === "user" && m.content).map((m) => m.content.trim()).filter((msg) => !isNoiseMessage(msg));
   if (all.length <= 2) return all;
   const first = all[0];
   const last = all[all.length - 1];
-  const middle = all.slice(1, -1).filter((msg) => !isNoiseMessage(msg));
+  const middle = all.slice(1, -1);
   return [first, ...middle, last];
 }
 function extractUnresolvedErrors(messages) {
@@ -1423,11 +1452,11 @@ function extractKeyDecisions(messages) {
   }
   return decisions.slice(-5);
 }
-function findFocusedWindow(messages) {
+function findFocusedWindowFrom(messages, fromUserMessage) {
   if (messages.length === 0) {
     return { messages, sessionAppearsComplete: false };
   }
-  const substantiveUserIndexes = messages.map((message, index) => ({ message, index })).filter(({ message }) => message.role === "user" && message.content && !isNoiseMessage(message.content)).map(({ index }) => index);
+  const substantiveUserIndexes = getSubstantiveUserIndexes(messages);
   if (substantiveUserIndexes.length === 0) {
     return { messages, sessionAppearsComplete: false };
   }
@@ -1437,7 +1466,9 @@ function findFocusedWindow(messages) {
   );
   const postToolUsers = substantiveUserIndexes.filter((index) => index > lastToolIndex);
   let startIndex = 0;
-  if (postToolUsers.length > 0) {
+  if (typeof fromUserMessage === "number" && fromUserMessage > 0) {
+    startIndex = substantiveUserIndexes[Math.min(fromUserMessage - 1, substantiveUserIndexes.length - 1)] ?? 0;
+  } else if (postToolUsers.length > 0) {
     startIndex = postToolUsers[0];
   } else if (lastToolIndex >= 0) {
     startIndex = substantiveUserIndexes.filter((index) => index <= lastToolIndex).at(-1) ?? 0;
@@ -1445,7 +1476,7 @@ function findFocusedWindow(messages) {
     startIndex = substantiveUserIndexes.at(-1) ?? 0;
   }
   const startMessage = messages[startIndex];
-  if (startMessage?.role === "user" && isReferentialMessage(startMessage.content)) {
+  if ((fromUserMessage === null || typeof fromUserMessage === "undefined") && startMessage?.role === "user" && isReferentialMessage(startMessage.content)) {
     const previousSubstantive = substantiveUserIndexes.filter((index) => index < startIndex).at(-1);
     if (typeof previousSubstantive === "number") {
       startIndex = previousSubstantive;
@@ -1453,10 +1484,25 @@ function findFocusedWindow(messages) {
   }
   const focused = messages.slice(startIndex);
   const hasToolActivity = focused.some((message) => message.role === "assistant" && message.toolCalls.length > 0);
-  const lastMessage = focused.at(-1);
+  const lastMessage = [...focused].reverse().find((message) => {
+    if (!message.content.trim() && message.toolCalls.length === 0) return false;
+    if (message.role === "assistant" && message.content.trim() && isAssistantNoiseMessage(message.content)) {
+      return false;
+    }
+    if (message.role === "user" && message.content.trim() && isNoiseMessage(message.content)) {
+      return false;
+    }
+    return true;
+  });
   const sessionAppearsComplete = Boolean(lastMessage) && lastMessage.role === "assistant" && lastMessage.toolCalls.length === 0 && !hasToolActivity;
   return { messages: focused, sessionAppearsComplete };
 }
+function listSubstantiveUserMessages(messages) {
+  return getSubstantiveUserIndexes(messages).map((messageIndex, index) => ({
+    index: index + 1,
+    text: messages[messageIndex]?.content.trim() || ""
+  }));
+}
 function extractWorkSummary(messages) {
   const filesModified = /* @__PURE__ */ new Set();
   const commands = [];
@@ -1482,7 +1528,7 @@ function extractWorkSummary(messages) {
 function extractLastAssistantAnswer(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const message = messages[i];
-    if (message.role === "assistant" && message.content.trim()) {
+    if (message.role === "assistant" && message.content.trim() && !isAssistantNoiseMessage(message.content)) {
       return compactText(message.content, 500);
     }
   }
@@ -1491,14 +1537,21 @@ function extractLastAssistantAnswer(messages) {
 function summarizeToolCall(toolCall) {
   const filePath = extractFilePath2(toolCall.input);
   const command = extractCommand2(toolCall.input);
+  const url = typeof toolCall.input.url === "string" ? toolCall.input.url : null;
+  const query = typeof toolCall.input.query === "string" ? toolCall.input.query : null;
+  const description = typeof toolCall.input.description === "string" ? toolCall.input.description : typeof toolCall.input.prompt === "string" ? toolCall.input.prompt : null;
   if (filePath) return `${toolCall.tool} ${filePath}`;
   if (command) return `${toolCall.tool}: ${summarizeCommand(command)}`;
+  if (url) return `${toolCall.tool}: ${compactText(url, 120)}`;
+  if (description) return `${toolCall.tool}: ${compactText(description, 120)}`;
+  if (query) return `${toolCall.tool}: ${compactText(query, 120)}`;
   return toolCall.tool;
 }
 function findLastActiveAssistant(messages) {
   for (let i = messages.length - 1; i >= 0; i--) {
     const message = messages[i];
     if (message.role !== "assistant") continue;
+    if (message.content.trim() && isAssistantNoiseMessage(message.content)) continue;
     if (message.content.trim() || message.toolCalls.length > 0) {
       return message;
     }
@@ -1526,7 +1579,8 @@ function buildRemainingWorkHints({
   errors,
   work,
   focusFiles,
-  recentCommands
+  recentCommands,
+  lastAssistantAnswer
 }) {
   if (sessionAppearsComplete) return [];
   const hints = [];
@@ -1544,26 +1598,33 @@ function buildRemainingWorkHints({
   if (focusFiles.length > 0) {
     hints.push("Run `git diff --` on the active files to see the exact in-progress changes before editing further.");
   }
+  if (hints.length === 0 && lastAssistantAnswer) {
+    hints.push("Continue from the last meaningful assistant answer above. This session appears to have stalled after planning or approval, not after code changes.");
+  }
   if (hints.length === 0) {
     hints.push("Inspect the active files and run `git diff` to determine the next concrete implementation step.");
   }
   return hints;
 }
 function selectSessionHistoryMessages(focusedMessages, allMessages, sessionAppearsComplete) {
-  if (sessionAppearsComplete) return focusedMessages;
-  const hasAssistantActivity = focusedMessages.some(
-    (message) => message.role === "assistant" && (message.content.trim() || message.toolCalls.length > 0)
-  );
-  if (focusedMessages.length >= 3 && hasAssistantActivity) return focusedMessages;
-  const filtered = allMessages.filter((message) => {
+  const sanitizeHistoryMessages = (messages) => messages.filter((message) => {
     if (message.role === "assistant" && message.content.trim() && isMetaQualityAssistantMessage(message.content)) {
       return false;
     }
+    if (message.role === "assistant" && message.content.trim() && isAssistantNoiseMessage(message.content)) {
+      return false;
+    }
     if (message.role === "user" && message.content && isNoiseMessage(message.content)) {
       return false;
     }
     return Boolean(message.content.trim()) || message.toolCalls.length > 0;
   });
+  if (sessionAppearsComplete) return sanitizeHistoryMessages(focusedMessages);
+  const hasAssistantActivity = focusedMessages.some(
+    (message) => message.role === "assistant" && (message.content.trim() || message.toolCalls.length > 0)
+  );
+  if (focusedMessages.length >= 3 && hasAssistantActivity) return sanitizeHistoryMessages(focusedMessages);
+  const filtered = sanitizeHistoryMessages(allMessages);
   return filtered.slice(-8);
 }
 function buildSessionHistory(focusedMessages, allMessages, sessionAppearsComplete) {
@@ -1571,7 +1632,7 @@ function buildSessionHistory(focusedMessages, allMessages, sessionAppearsComplet
   const entries = historyMessages.map((message) => {
     const parts = [];
     if (message.content.trim()) {
-      if (message.role === "assistant" && isMetaQualityAssistantMessage(message.content)) {
+      if (message.role === "assistant" && (isMetaQualityAssistantMessage(message.content) || isAssistantNoiseMessage(message.content))) {
         return null;
       }
       parts.push(compactText(message.content, 220));
@@ -1610,7 +1671,7 @@ function extractFocusFiles(ctx, work) {
   ]).slice(0, 6);
 }
 function buildRawPrompt(ctx, options = {}) {
-  const focused = findFocusedWindow(ctx.messages);
+  const focused = findFocusedWindowFrom(ctx.messages, options.fromUserMessage);
   const userMessages = filterUserMessages(focused.messages);
   const errors = extractUnresolvedErrors(focused.messages);
   const decisions = extractKeyDecisions(focused.messages);
@@ -1624,7 +1685,8 @@ function buildRawPrompt(ctx, options = {}) {
     errors,
     work,
     focusFiles,
-    recentCommands
+    recentCommands,
+    lastAssistantAnswer
   });
   const sessionHistory = buildSessionHistory(focused.messages, ctx.messages, focused.sessionAppearsComplete);
   let prompt = "";
@@ -2128,6 +2190,9 @@ function formatRunSummary({
   lines.push(`  Messages: ${ctx.messages.length}`);
   lines.push(`  Files: ${ctx.filesModified.length} modified, ${ctx.filesRead.length} read`);
   lines.push(`  Git: ${summarizeGitContext(ctx.gitContext)}`);
+  if (options.fromUser) {
+    lines.push(`  Focus: user prompt #${options.fromUser}`);
+  }
   lines.push(`  Target: ${options.target}`);
   lines.push(`  Mode: ${mode === "raw" ? "raw" : `refined via ${options.provider}${model ? ` (${model})` : ""}`}`);
   return lines.join("\n");
@@ -2279,9 +2344,50 @@ async function promptForSource() {
     });
   });
 }
+function summarizePromptChoice(text) {
+  return text.replace(/\s+/g, " ").trim().slice(0, 100);
+}
+async function promptForUserStart(messages) {
+  const userPrompts = listSubstantiveUserMessages(messages);
+  if (userPrompts.length === 0) {
+    return null;
+  }
+  if (userPrompts.length === 1) {
+    process.stderr.write("\nOnly one substantive user prompt was found. Using it automatically.\n");
+    return 1;
+  }
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stderr
+  });
+  process.stderr.write("\nSelect the user prompt to preserve context from:\n\n");
+  for (const prompt of userPrompts) {
+    process.stderr.write(`  ${prompt.index}) ${summarizePromptChoice(prompt.text)}
+`);
+  }
+  process.stderr.write("\n");
+  return new Promise((resolve) => {
+    rl.question(`Enter choice (1-${userPrompts.length}): `, (answer) => {
+      rl.close();
+      const trimmed = answer.trim();
+      if (!trimmed) {
+        process.stderr.write("Invalid choice, using automatic focus.\n");
+        resolve(null);
+        return;
+      }
+      const idx = Number.parseInt(trimmed, 10);
+      if (idx >= 1 && idx <= userPrompts.length) {
+        resolve(idx);
+      } else {
+        process.stderr.write("Invalid choice, using automatic focus.\n");
+        resolve(null);
+      }
+    });
+  });
+}
 async function main(argv = process.argv.slice(2)) {
   const options = parseArgs(argv);
-  const pkgInfo = { name: "ctx-switch", version: "2.0.6" };
+  const pkgInfo = { name: "ctx-switch", version: "2.0.7" };
   const ui = createTheme(process.stderr);
   if (options.help) {
     process.stdout.write(`${getHelpText(pkgInfo)}
@@ -2344,6 +2450,20 @@ async function main(argv = process.argv.slice(2)) {
   if (messages.length === 0) {
     fail(`Parsed zero usable messages from ${sessionPath}`);
   }
+  let fromUserMessage = options.fromUser;
+  const userPrompts = listSubstantiveUserMessages(messages);
+  if (fromUserMessage !== null && fromUserMessage > userPrompts.length) {
+    fail(
+      `Requested --from-user ${fromUserMessage}, but only ${userPrompts.length} substantive user prompt(s) were found.`,
+      {
+        suggestions: ["Run `ctx-switch --pick-user` to choose interactively.", "Omit `--from-user` to use automatic focus."]
+      }
+    );
+  }
+  if (options.pickUser && process.stdin.isTTY) {
+    ui.step("Choosing preserved context start");
+    fromUserMessage = await promptForUserStart(messages);
+  }
   ui.step("Capturing git context");
   const gitContext = getGitContext(cwd);
   const ctx = buildSessionContext({
@@ -2358,7 +2478,7 @@ async function main(argv = process.argv.slice(2)) {
   let activeModel = null;
   if (!options.refine) {
     ui.step("Building continuation prompt");
-    finalPrompt = buildRawPrompt(ctx, { target: options.target });
+    finalPrompt = buildRawPrompt(ctx, { target: options.target, fromUserMessage });
   } else {
     const provider = options.provider;
     let apiKey = getApiKey({
@@ -2396,7 +2516,7 @@ async function main(argv = process.argv.slice(2)) {
         apiKey,
         model,
         systemPrompt: buildRefinementSystemPrompt(options.target),
-        userPrompt: buildRefinementDump(ctx, { target: options.target }),
+        userPrompt: buildRefinementDump(ctx, { target: options.target, fromUserMessage }),
         timeoutMs: 0,
         onStatus: (status) => {
           if (!streamStarted) reporter.update(status);
@@ -2429,7 +2549,7 @@ async function main(argv = process.argv.slice(2)) {
           ui.note(`Provider detail: ${refined.rawError}`);
         }
         ui.note("Falling back to the raw structured prompt.");
-        finalPrompt = buildRawPrompt(ctx, { target: options.target });
+        finalPrompt = buildRawPrompt(ctx, { target: options.target, fromUserMessage });
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctx-switch",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Switch coding agents without losing context. Generate handoff prompts across Claude Code, Codex, and OpenCode.",
   "type": "module",
   "main": "./dist/index.mjs",