Merge branch 'slash-command-in-vscode-extension'

Author: qorzj

packages/cli/src/ui/core/prompt-buffer.ts

@@ -1,3 +1,5 @@
+import { getSlashToken } from "@vegamo/deepcode-core/common/slash-commands";
+
 export type PromptBufferState = {
   text: string;
   cursor: number;
@@ -154,11 +156,7 @@ export function isEmpty(state: PromptBufferState): boolean {
 }
 
 export function getCurrentSlashToken(state: PromptBufferState): string | null {
-  const text = state.text;
-  if (text.length === 0 || !text.startsWith("/")) {
-    return null;
-  }
-  return text;
+  return getSlashToken(state.text);
 }
 
 /**

packages/cli/src/ui/core/slash-commands.ts

@@ -1,206 +1 @@
-import type { SkillInfo } from "@vegamo/deepcode-core";
-
-export type SlashCommandKind =
-  | "skill"
-  | "skills"
-  | "model"
-  | "permissions"
-  | "plan"
-  | "new"
-  | "init"
-  | "resume"
-  | "fork"
-  | "continue"
-  | "compact"
-  | "undo"
-  | "mcp"
-  | "raw"
-  | "exit";
-
-export type SlashCommandItem = {
-  kind: SlashCommandKind;
-  name: string;
-  label: string;
-  description: string;
-  skill?: SkillInfo;
-  args?: string[];
-};
-
-export const BUILTIN_SLASH_COMMANDS: SlashCommandItem[] = [
-  {
-    kind: "skills",
-    name: "skills",
-    label: "/skills",
-    description: "List available skills",
-  },
-  {
-    kind: "model",
-    name: "model",
-    label: "/model",
-    description: "Select model, thinking mode and effort control",
-  },
-  {
-    kind: "permissions",
-    name: "permissions",
-    label: "/permissions",
-    description: "Configure tool permissions",
-  },
-  {
-    kind: "plan",
-    name: "plan",
-    label: "/plan",
-    description: "Switch the input to Plan Mode",
-  },
-  {
-    kind: "new",
-    name: "new",
-    label: "/new",
-    description: "Start a fresh conversation",
-  },
-  {
-    kind: "init",
-    name: "init",
-    label: "/init",
-    description: "Initialize an AGENTS.md file with instructions for LLM",
-  },
-  {
-    kind: "resume",
-    name: "resume",
-    label: "/resume",
-    description: "Pick a previous conversation to continue",
-  },
-  {
-    kind: "fork",
-    name: "fork",
-    label: "/fork",
-    description: "Fork the current conversation",
-  },
-  {
-    kind: "continue",
-    name: "continue",
-    label: "/continue",
-    description: "Continue the active conversation or pick one to resume",
-  },
-  {
-    kind: "compact",
-    name: "compact",
-    label: "/compact",
-    description: "Compact the current conversation",
-  },
-  {
-    kind: "undo",
-    name: "undo",
-    label: "/undo",
-    description: "Restore code and/or conversation to a previous point",
-  },
-  {
-    kind: "mcp",
-    name: "mcp",
-    label: "/mcp",
-    description: "Show MCP server status and available tools",
-  },
-  {
-    kind: "raw",
-    name: "raw",
-    label: "/raw",
-    args: ["lite", "normal", "raw-scrollback"],
-    description: "Toggle display mode for viewing or collapsing reasoning content",
-  },
-  {
-    kind: "exit",
-    name: "exit",
-    label: "/exit",
-    description: "Quit Deep Code CLI",
-  },
-];
-
-export function buildSlashCommands(skills: SkillInfo[]): SlashCommandItem[] {
-  const skillItems: SlashCommandItem[] = skills.map((skill) => ({
-    kind: "skill",
-    name: skill.name,
-    label: `/${skill.name}`,
-    description: skill.description || "(no description)",
-    skill,
-  }));
-  return [...skillItems, ...BUILTIN_SLASH_COMMANDS];
-}
-
-export function filterSlashCommands(items: SlashCommandItem[], token: string): SlashCommandItem[] {
-  if (!token.startsWith("/")) {
-    return [];
-  }
-  const query = token.slice(1).toLowerCase();
-  if (!query) {
-    return items;
-  }
-  const prefixMatches: SlashCommandItem[] = [];
-  const otherMatches: SlashCommandItem[] = [];
-  for (const item of items) {
-    const name = item.name.toLowerCase();
-    if (name.startsWith(query)) {
-      prefixMatches.push(item);
-    } else if (name.includes(query)) {
-      otherMatches.push(item);
-    }
-  }
-  return [...prefixMatches, ...otherMatches];
-}
-
-export function findExactSlashCommand(items: SlashCommandItem[], token: string): SlashCommandItem | null {
-  if (!token.startsWith("/")) {
-    return null;
-  }
-  const query = token.slice(1);
-  const matches = items.filter((item) => item.name === query);
-  return matches.find((item) => item.kind !== "skill") ?? matches[0] ?? null;
-}
-
-export type SlashSubmission =
-  | { kind: "command"; item: SlashCommandItem }
-  | { kind: "plan"; item: SlashCommandItem; text: string }
-  | { kind: "raw"; item: SlashCommandItem; mode: string }
-  | { kind: "argument-error"; item: SlashCommandItem; argument: string };
-
-/**
- * Classify a submitted slash input without touching UI state. A command alone
- * runs as before; `/plan <text>` is a one-shot plan-mode prompt; `/raw <mode>`
- * selects that mode and reports an unknown mode. Other commands keep their
- * existing behavior and ignore trailing text.
- */
-export function resolveSlashSubmission(items: SlashCommandItem[], text: string): SlashSubmission | null {
-  const trimmed = text.trim();
-  if (!trimmed.startsWith("/")) {
-    return null;
-  }
-  const match = /^(\S+)([\s\S]*)$/.exec(trimmed);
-  if (!match) {
-    return null;
-  }
-  const item = findExactSlashCommand(items, match[1]);
-  if (!item) {
-    return null;
-  }
-  const rest = match[2].trim();
-  if (!rest) {
-    return { kind: "command", item };
-  }
-  if (item.kind === "plan") {
-    return { kind: "plan", item, text: rest };
-  }
-  if (item.kind === "raw") {
-    if (item.args?.includes(rest)) {
-      return { kind: "raw", item, mode: rest };
-    }
-    return { kind: "argument-error", item, argument: rest };
-  }
-  // Other commands keep their existing behavior and ignore trailing text.
-  return { kind: "command", item };
-}
-
-export function formatSlashCommandDescription(description: string): string {
-  return (description || "(no description)").trim().replace(/\s+/g, " ");
-}
-
-export function formatSlashCommandLabel(item: SlashCommandItem): string {
-  return item.kind === "skill" && item.skill?.isLoaded ? `${item.label} ✓` : item.label;
-}
+export * from "@vegamo/deepcode-core/common/slash-commands";

packages/cli/src/ui/views/App.tsx

@@ -1,3 +1,4 @@
+import { getCompletedProposedPlan } from "@vegamo/deepcode-core/common/plan-implementation";
 import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Box, Static, Text, useApp, useStdout, useWindowSize } from "ink";
 import chalk from "chalk";
@@ -24,7 +25,6 @@ import {
 import { PermissionPrompt, type PermissionPromptResult } from "./PermissionPrompt";
 import {
   PlanImplementationPrompt,
-  extractProposedPlan,
   getClearContextImplementationPrompt,
   getImplementationPrompt,
   type PlanImplementationChoice,
@@ -525,10 +525,11 @@ function App({
         await refreshSkills();
         refreshSessionsList();
         const completedSession = sessionManager.getSession(sessionManager.getActiveSessionId() ?? "");
-        const proposedPlan =
-          prompt.planMode && completedSession?.status === "completed"
-            ? extractProposedPlan(completedSession.assistantReply)
-            : null;
+        const proposedPlan = getCompletedProposedPlan(
+          prompt.planMode === true,
+          completedSession?.status,
+          completedSession?.assistantReply ?? null
+        );
         setPendingPlanImplementation(proposedPlan);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);

packages/cli/src/ui/views/PlanImplementationPrompt.tsx

@@ -2,44 +2,20 @@ import React, { useEffect, useState } from "react";
 import { Box, Text } from "ink";
 import { useTerminalInput } from "../hooks";
 import type { InputKey } from "../hooks";
+import { PLAN_IMPLEMENTATION_CHOICES as CHOICES } from "@vegamo/deepcode-core/common/plan-implementation";
+import type { PlanImplementationChoice } from "@vegamo/deepcode-core/common/plan-implementation";
 
-export type PlanImplementationChoice = "implement" | "clear-context" | "stay" | "default";
+export {
+  extractProposedPlan,
+  getImplementationPrompt,
+  getClearContextImplementationPrompt,
+} from "@vegamo/deepcode-core/common/plan-implementation";
+export type { PlanImplementationChoice } from "@vegamo/deepcode-core/common/plan-implementation";
 
 type Props = {
   onSelect: (choice: PlanImplementationChoice) => void;
 };
 
-const CHOICES: Array<{ value: PlanImplementationChoice; label: string }> = [
-  { value: "implement", label: "implement this plan" },
-  { value: "clear-context", label: "clear context and implement" },
-  { value: "stay", label: "stay in Plan mode" },
-  { value: "default", label: "switch to Default mode" },
-];
-
-const CLEAR_CONTEXT_IMPLEMENTATION_PREFIX =
-  "A previous agent produced the plan below to accomplish the user's task. " +
-  "Implement the plan in a fresh context. Treat the plan as the source of " +
-  "user intent, re-read files as needed, and carry the work through " +
-  "implementation and verification.";
-
-/** Return only a complete proposed plan, so historical or partial tags cannot trigger the chooser. */
-export function extractProposedPlan(reply: string | null): string | null {
-  if (!reply) {
-    return null;
-  }
-  const match = reply.match(/<proposed_plan>\s*([\s\S]*?\S[\s\S]*?)\s*<\/proposed_plan>/);
-  return match?.[1] ?? null;
-}
-
-export function getImplementationPrompt(plan: string): string {
-  const fullWidthPunctuationCount = (plan.match(/[，、；。]/g) ?? []).length;
-  return fullWidthPunctuationCount > 5 ? "实现此方案。" : "Implement the plan.";
-}
-
-export function getClearContextImplementationPrompt(plan: string): string {
-  return `${CLEAR_CONTEXT_IMPLEMENTATION_PREFIX}\n\n${plan}`;
-}
-
 export function getPlanImplementationChoice(
   input: string,
   key: Pick<InputKey, "escape" | "return">,

packages/core/package.json

@@ -35,6 +35,14 @@
       "types": "./dist/common/npm-registry.d.ts",
       "import": "./dist/common/npm-registry.js"
     },
+    "./common/plan-implementation": {
+      "types": "./dist/common/plan-implementation.d.ts",
+      "import": "./dist/common/plan-implementation.js"
+    },
+    "./common/slash-commands": {
+      "types": "./dist/common/slash-commands.d.ts",
+      "import": "./dist/common/slash-commands.js"
+    },
     "./common/session-id": {
       "types": "./dist/common/session-id.d.ts",
       "import": "./dist/common/session-id.js"

packages/core/src/common/plan-implementation.ts

@@ -0,0 +1,40 @@
+export type PlanImplementationChoice = "implement" | "clear-context" | "stay" | "default";
+
+export const PLAN_IMPLEMENTATION_CHOICES: Array<{ value: PlanImplementationChoice; label: string }> = [
+  { value: "implement", label: "implement this plan" },
+  { value: "clear-context", label: "clear context and implement" },
+  { value: "stay", label: "stay in Plan mode" },
+  { value: "default", label: "switch to Default mode" },
+];
+
+const CLEAR_CONTEXT_IMPLEMENTATION_PREFIX =
+  "A previous agent produced the plan below to accomplish the user's task. " +
+  "Implement the plan in a fresh context. Treat the plan as the source of " +
+  "user intent, re-read files as needed, and carry the work through " +
+  "implementation and verification.";
+
+/** Extract a complete, non-empty proposed plan from the final reply. */
+export function extractProposedPlan(reply: string | null): string | null {
+  if (!reply) {
+    return null;
+  }
+  const match = reply.match(/<proposed_plan>\s*([\s\S]*?\S[\s\S]*?)\s*<\/proposed_plan>/);
+  return match?.[1] ?? null;
+}
+
+export function getImplementationPrompt(plan: string): string {
+  const fullWidthPunctuationCount = (plan.match(/[，、；。]/g) ?? []).length;
+  return fullWidthPunctuationCount > 5 ? "实现此方案。" : "Implement the plan.";
+}
+
+export function getClearContextImplementationPrompt(plan: string): string {
+  return `${CLEAR_CONTEXT_IMPLEMENTATION_PREFIX}\n\n${plan}`;
+}
+
+export function getCompletedProposedPlan(
+  planMode: boolean,
+  status: string | null | undefined,
+  reply: string | null
+): string | null {
+  return planMode && status === "completed" ? extractProposedPlan(reply) : null;
+}