snow-ai 0.8.9 → 0.8.11

package/bundle/cli.mjs

@@ -46749,6 +46749,7 @@ var init_en = __esm({
         deeperSearchHint: "More directories not scanned \xB7 press \u2193 on the last item to search deeper",
         multiSelectHint: "Space toggle \xB7 Enter insert \xB7 select multiple files at once",
         multiSelectActiveHint: "{count} selected \xB7 Space toggle \xB7 Enter insert all",
+        workspaceFilterHint: "Workspace: {filter} \xB7 searching in selected dir only",
         contentSearchHeader: "\u2261 Content Search",
         filesHeader: "\u2261 Files [{mode} \u2022 Ctrl+T]",
         treeMode: "Tree",
@@ -48976,6 +48977,7 @@ var init_zh = __esm({
         deeperSearchHint: "\u5C1A\u6709\u66F4\u6DF1\u76EE\u5F55\u672A\u626B\u63CF \xB7 \u5728\u672B\u9879\u6309 \u2193 \u7EE7\u7EED\u6DF1\u5165\u641C\u7D22",
         multiSelectHint: "\u7A7A\u683C \u52FE\u9009 \xB7 Enter \u4E00\u6B21\u63D2\u5165 \xB7 \u652F\u6301\u591A\u9009",
         multiSelectActiveHint: "\u5DF2\u52FE\u9009 {count} \u9879 \xB7 \u7A7A\u683C \u5207\u6362 \xB7 Enter \u4E00\u6B21\u63D2\u5165",
+        workspaceFilterHint: "\u5DE5\u4F5C\u533A: {filter} \xB7 \u4EC5\u641C\u7D22\u6240\u9009\u76EE\u5F55",
         contentSearchHeader: "\u2261 \u5185\u5BB9\u641C\u7D22",
         filesHeader: "\u2261 \u6587\u4EF6 [{mode} \u2022 Ctrl+T]",
         treeMode: "\u6811\u5F62",
@@ -51202,6 +51204,7 @@ var init_zh_TW = __esm({
         deeperSearchHint: "\u5C1A\u6709\u66F4\u6DF1\u76EE\u9304\u672A\u6383\u63CF \xB7 \u5728\u672B\u9805\u6309 \u2193 \u7E7C\u7E8C\u6DF1\u5165\u641C\u5C0B",
         multiSelectHint: "\u7A7A\u767D\u9375 \u52FE\u9078 \xB7 Enter \u4E00\u6B21\u63D2\u5165 \xB7 \u652F\u63F4\u591A\u9078",
         multiSelectActiveHint: "\u5DF2\u52FE\u9078 {count} \u9805 \xB7 \u7A7A\u767D\u9375 \u5207\u63DB \xB7 Enter \u4E00\u6B21\u63D2\u5165",
+        workspaceFilterHint: "\u5DE5\u4F5C\u5340: {filter} \xB7 \u50C5\u641C\u5C0B\u6240\u9078\u76EE\u9304",
         contentSearchHeader: "\u2261 \u5167\u5BB9\u641C\u5C0B",
         filesHeader: "\u2261 \u6A94\u6848 [{mode} \u2022 Ctrl+T]",
         treeMode: "\u6A39\u72C0",
@@ -157661,8 +157664,8 @@ function toGeminiImagePart(image2) {
     return {
       inlineData: {
         mimeType: dataUrlMatch[1] || image2.mimeType || "image/png",
-        data: image2.data
-        // 保留完整的 data URL
+        data: dataUrlMatch[2]
+        // 只保留纯 base64 数据
       }
     };
   }
@@ -157670,8 +157673,8 @@ function toGeminiImagePart(image2) {
   return {
     inlineData: {
       mimeType,
-      data: `data:${mimeType};base64,${data}`
-      // 补齐 data: 头
+      data
+      // 纯 base64 数据
     }
   };
 }
@@ -502936,6 +502939,7 @@ Output: ${combinedOutput}`
 var hookResultInterpreter_exports = {};
 __export(hookResultInterpreter_exports, {
   buildErrorDetails: () => buildErrorDetails,
+  extractHookProvidedConfirmation: () => extractHookProvidedConfirmation,
   findFirstFailedCommand: () => findFirstFailedCommand,
   interpretHookResult: () => interpretHookResult
 });
@@ -502962,6 +502966,56 @@ function interpretHookResult(hookType, hookResult, originalContent) {
   const strategy = hookStrategies[hookType];
   return strategy.interpret(hookResult, originalContent);
 }
+function extractHookProvidedConfirmation(hookResult) {
+  for (const result2 of hookResult.results) {
+    if (result2.type !== "command" || !result2.success || !result2.output) {
+      continue;
+    }
+    const rawOutput = result2.output.trim();
+    if (!rawOutput) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(rawOutput);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && typeof parsed.result === "string") {
+        const hookResultValue = parsed.result.toLowerCase();
+        if (hookResultValue === "approve") {
+          return "approve";
+        }
+        if (hookResultValue === "approve_always") {
+          return "approve_always";
+        }
+        if (hookResultValue === "reject") {
+          return "reject";
+        }
+        if (hookResultValue === "reject_with_reply") {
+          return {
+            type: "reject_with_reply",
+            reason: typeof parsed.reason === "string" ? parsed.reason : "Rejected by toolConfirmation hook"
+          };
+        }
+      }
+    } catch {
+      const lowerOutput = rawOutput.toLowerCase().trim();
+      if (lowerOutput === "approve" || lowerOutput === "approve_once") {
+        return "approve";
+      }
+      if (lowerOutput === "approve_always") {
+        return "approve_always";
+      }
+      if (lowerOutput === "reject") {
+        return "reject";
+      }
+      if (lowerOutput === "reject_with_reply") {
+        return {
+          type: "reject_with_reply",
+          reason: "Rejected by toolConfirmation hook"
+        };
+      }
+    }
+  }
+  return null;
+}
 var init_hookResultInterpreter = __esm({
   "dist/utils/execution/hookResultInterpreter.js"() {
     "use strict";
@@ -535166,6 +535220,9 @@ async function listJsonCommandsRecursively(dir, prefixPath) {
   for (const entry of entries) {
     const entryPath = join32(dir, entry.name);
     if (entry.isDirectory()) {
+      if (entry.name.startsWith(".")) {
+        continue;
+      }
       const childPrefix = prefixPath ? `${prefixPath}/${entry.name}` : entry.name;
       results.push(...await listJsonCommandsRecursively(entryPath, childPrefix));
       continue;
@@ -535189,8 +535246,15 @@ async function loadCustomCommandFromFile(entry, defaultLocation) {
   try {
     const content = await readFile2(entry.filePath, "utf-8");
     const cmd = JSON.parse(content);
+    if (typeof cmd.command !== "string" || cmd.command.length === 0) {
+      return null;
+    }
+    if (cmd.type !== "execute" && cmd.type !== "prompt" && cmd.type !== "panel") {
+      return null;
+    }
     cmd.name = entry.inferredCommandName;
-    cmd.description = cmd.description || cmd.command;
+    const rawDesc = cmd.description ?? cmd.command;
+    cmd.description = typeof rawDesc === "string" ? rawDesc : "";
     if (!cmd.location) {
       cmd.location = defaultLocation;
     }
@@ -535267,7 +535331,7 @@ function checkCommandExists(name, location, projectRoot) {
     return false;
   }
 }
-async function saveCustomCommand(name, command, type, description, location = "global", projectRoot) {
+async function saveCustomCommand(name, command, type, description, location = "global", projectRoot, argsHint, argsOptions) {
   if (isCommandNameConflict(name)) {
     throw new Error(`Command name "${name}" conflicts with an existing built-in or custom command`);
   }
@@ -535275,7 +535339,15 @@ async function saveCustomCommand(name, command, type, description, location = "g
   const dir = getCustomCommandsDir(location, projectRoot);
   const filePath = getCommandJsonFilePath(dir, name);
   await mkdir3(dirname12(filePath), { recursive: true });
-  const data = { name, command, type, description, location };
+  const data = {
+    name,
+    command,
+    type,
+    description,
+    location,
+    ...argsHint !== void 0 ? { argsHint } : {},
+    ...argsOptions !== void 0 ? { argsOptions } : {}
+  };
   await writeFile(filePath, JSON.stringify(data, null, 2), "utf-8");
 }
 function getCustomCommands() {
@@ -535290,7 +535362,7 @@ function normalizeImportedCustomCommand(value, location) {
   if (!isRecord3(value)) {
     return null;
   }
-  const { name, command, type, description } = value;
+  const { name, command, type, description, argsHint, argsOptions } = value;
   if (typeof name !== "string" || typeof command !== "string" || type !== "execute" && type !== "prompt" && type !== "panel") {
     return null;
   }
@@ -535303,6 +535375,10 @@ function normalizeImportedCustomCommand(value, location) {
     command,
     type,
     ...typeof description === "string" ? { description } : {},
+    ...typeof argsHint === "string" ? { argsHint } : {},
+    ...Array.isArray(argsOptions) ? {
+      argsOptions: argsOptions.filter((v) => typeof v === "string")
+    } : {},
     location
   };
 }
@@ -535332,6 +535408,16 @@ async function deleteCustomCommand(name, location = "global", projectRoot) {
   unregisterCommand(name);
   customCommandsCache = customCommandsCache.filter((cmd) => cmd.name !== name);
 }
+function applyArgsToCommand(command, args2) {
+  const trimmedArgs = args2 == null ? void 0 : args2.trim();
+  if (command.includes("$ARGUMENTS")) {
+    return command.split("$ARGUMENTS").join(trimmedArgs ?? "");
+  }
+  if (!trimmedArgs) {
+    return command;
+  }
+  return `${command} ${trimmedArgs}`;
+}
 async function registerCustomCommands(projectRoot) {
   const customCommands = await loadCustomCommands(projectRoot);
   customCommandsCache = customCommands;
@@ -535348,7 +535434,7 @@ async function registerCustomCommands(projectRoot) {
           };
         }
         if (cmd.type === "execute") {
-          const finalCommand = args2 ? `${cmd.command} ${args2}` : cmd.command;
+          const finalCommand = applyArgsToCommand(cmd.command, args2);
           return {
             success: true,
             message: `Executing: ${finalCommand}`,
@@ -535364,7 +535450,7 @@ async function registerCustomCommands(projectRoot) {
             prompt: cmd.command
           };
         }
-        const finalPrompt = args2 ? `${cmd.command} ${args2}` : cmd.command;
+        const finalPrompt = applyArgsToCommand(cmd.command, args2);
         return {
           success: true,
           message: `Sending to AI: ${finalPrompt}`,
@@ -537068,7 +537154,7 @@ var init_encoderManager = __esm({
 });
 
 // dist/utils/core/todoPreprocessor.js
-function formatTodoContext(todos) {
+function formatTodoContext(todos, options3) {
   if (todos.length === 0) {
     return "";
   }
@@ -537085,6 +537171,11 @@ function formatTodoContext(todos) {
     '**Important**: Update TODO status immediately after completing each task using todo-manage with action "update".',
     ""
   ];
+  const hasIncomplete = todos.some((t) => t.status !== "completed");
+  if ((options3 == null ? void 0 : options3.isFollowUp) && hasIncomplete) {
+    const toolName = options3.ultraMode ? "todo-ultra" : "todo-manage";
+    lines.push(`**Action Required**: This is a follow-up message with an active TODO list. You MUST call \`${toolName}({action: "get"})\` first (paired with an action tool) to restore your TODO session context before doing any other work. This ensures the TODO list stays in sync and you continue using the TODO workflow for this task.`, "");
+  }
   return lines.join("\n");
 }
 var init_todoPreprocessor = __esm({
@@ -537130,14 +537221,18 @@ async function initializeConversationSession(planMode, vulnerabilityHuntingMode,
 ${companionPromptAddon}` : baseSystemPrompt
     }
   ];
+  const session = sessionManager.getCurrentSession();
   if (existingTodoList && existingTodoList.todos.length > 0) {
-    const todoContext = formatTodoContext(existingTodoList.todos);
+    const isFollowUp = !!session && session.messages.length > 0;
+    const todoContext = formatTodoContext(existingTodoList.todos, {
+      isFollowUp,
+      ultraMode: existingTodoList.ultraMode
+    });
     conversationMessages.push({
       role: "user",
       content: todoContext
     });
   }
-  const session = sessionManager.getCurrentSession();
   if (session && session.messages.length > 0) {
     const filteredMessages = session.messages.filter((msg) => !msg.subAgentInternal);
     conversationMessages.push(...filteredMessages);
@@ -538060,7 +538155,8 @@ var init_tpsTracker = __esm({
           writable: true,
           value: {
             tps: 0,
-            peakTps: 0
+            peakTps: 0,
+            ttftMs: null
           }
         });
         Object.defineProperty(this, "tokenBuckets", {
@@ -538081,6 +538177,24 @@ var init_tpsTracker = __esm({
           writable: true,
           value: 0
         });
+        Object.defineProperty(this, "sessionStartTime", {
+          enumerable: true,
+          configurable: true,
+          writable: true,
+          value: 0
+        });
+        Object.defineProperty(this, "ttftMs", {
+          enumerable: true,
+          configurable: true,
+          writable: true,
+          value: null
+        });
+        Object.defineProperty(this, "hasFirstToken", {
+          enumerable: true,
+          configurable: true,
+          writable: true,
+          value: false
+        });
         Object.defineProperty(this, "snapshotRef", {
           enumerable: true,
           configurable: true,
@@ -538147,6 +538261,10 @@ var init_tpsTracker = __esm({
           return;
         }
         const now = Date.now();
+        if (!this.hasFirstToken) {
+          this.hasFirstToken = true;
+          this.ttftMs = now - this.sessionStartTime;
+        }
         const second = Math.floor(now / 1e3);
         if (this.currentSecond !== 0 && this.currentSecond !== second) {
           if (this.currentSecondTokens > 0) {
@@ -538177,9 +538295,13 @@ var init_tpsTracker = __esm({
         this.tokenBuckets.clear();
         this.currentSecond = 0;
         this.currentSecondTokens = 0;
+        this.sessionStartTime = Date.now();
+        this.ttftMs = null;
+        this.hasFirstToken = false;
         this.snapshot = {
           tps: 0,
-          peakTps: 0
+          peakTps: 0,
+          ttftMs: null
         };
         this.snapshotRef = this.snapshot;
       }
@@ -538219,7 +538341,8 @@ var init_tpsTracker = __esm({
         }
         this.snapshot = {
           tps,
-          peakTps
+          peakTps,
+          ttftMs: this.ttftMs
         };
         this.snapshotRef = this.snapshot;
         this.emitChange();
@@ -538540,6 +538663,7 @@ async function processStreamRound(ctx) {
     signal: controller.signal,
     onRetry
   });
+  tpsTracker.resetSession();
   for await (const chunk2 of streamGenerator) {
     if (controller.signal.aborted) {
       break;
@@ -544024,6 +544148,39 @@ function extractMultimodalContent(result2) {
     textContent: JSON.stringify(result2)
   };
 }
+function formatAskUserAnswer(selected, customInput) {
+  const selectedText = Array.isArray(selected) ? selected.join(", ") : selected;
+  return customInput ? `${selectedText}: ${customInput}` : selectedText;
+}
+function extractHookProvidedAnswer(hookResult) {
+  for (const result2 of hookResult.results) {
+    if (result2.type !== "command" || !result2.success || !result2.output) {
+      continue;
+    }
+    const rawOutput = result2.output.trim();
+    if (!rawOutput) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(rawOutput);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed) && parsed.selected !== void 0) {
+        const selected = parsed.selected;
+        if (typeof selected === "string" || Array.isArray(selected) && selected.every((s) => typeof s === "string")) {
+          return {
+            selected,
+            customInput: typeof parsed.customInput === "string" ? parsed.customInput : void 0
+          };
+        }
+      }
+      if (Array.isArray(parsed) && parsed.every((s) => typeof s === "string")) {
+        return { selected: parsed };
+      }
+    } catch {
+      return { selected: rawOutput };
+    }
+  }
+  return null;
+}
 async function executeToolCall(toolCall, abortSignal, onTokenUpdate, onSubAgentMessage, requestToolConfirmation, isToolAutoApproved, yoloMode, addToAlwaysApproved, onUserInteractionNeeded, sessionId, workingDirectory) {
   let result2;
   let executionError = null;
@@ -544054,11 +544211,12 @@ async function executeToolCall(toolCall, abortSignal, onTokenUpdate, onSubAgentM
     try {
       const args2 = safeParseToolArguments(toolCall.function.arguments);
       recordToolContent(telemetry.span, "tool.input", args2, telemetry.metricAttributes);
+      let beforeHookResult = null;
       try {
         const { unifiedHooksExecutor: unifiedHooksExecutor2 } = await Promise.resolve().then(() => (init_unifiedHooksExecutor(), unifiedHooksExecutor_exports));
         const { interpretHookResult: interpretHookResult2 } = await Promise.resolve().then(() => (init_hookResultInterpreter(), hookResultInterpreter_exports));
-        const hookResult = await unifiedHooksExecutor2.executeHooks("beforeToolCall", { toolName: toolCall.function.name, args: args2 });
-        const interpreted = interpretHookResult2("beforeToolCall", hookResult);
+        beforeHookResult = await unifiedHooksExecutor2.executeHooks("beforeToolCall", { toolName: toolCall.function.name, args: args2 });
+        const interpreted = interpretHookResult2("beforeToolCall", beforeHookResult);
         if (interpreted.action === "block") {
           result2 = {
             tool_call_id: toolCall.id,
@@ -544072,6 +544230,22 @@ async function executeToolCall(toolCall, abortSignal, onTokenUpdate, onSubAgentM
       } catch (error42) {
         console.warn("Failed to execute beforeToolCall hook:", error42);
       }
+      if (toolCall.function.name === "askuser-ask_question" && beforeHookResult) {
+        const hookAnswer = extractHookProvidedAnswer(beforeHookResult);
+        if (hookAnswer) {
+          const answerText = formatAskUserAnswer(hookAnswer.selected, hookAnswer.customInput);
+          result2 = {
+            tool_call_id: toolCall.id,
+            role: "tool",
+            content: JSON.stringify({
+              answer: answerText,
+              selected: hookAnswer.selected,
+              customInput: hookAnswer.customInput
+            })
+          };
+          return result2;
+        }
+      }
       if (toolCall.function.name.startsWith("team-")) {
         const teamToolName = toolCall.function.name.substring("team-".length);
         const teamArgs = args2;
@@ -544254,7 +544428,7 @@ ${injectedSummary}`
             };
             return result2;
           }
-          const answerText = response.customInput ? `${Array.isArray(response.selected) ? response.selected.join(", ") : response.selected}: ${response.customInput}` : Array.isArray(response.selected) ? response.selected.join(", ") : response.selected;
+          const answerText = formatAskUserAnswer(response.selected, response.customInput);
           result2 = {
             tool_call_id: toolCall.id,
             role: "tool",
@@ -558428,13 +558602,16 @@ You can also update manually:
 function getNpmRegistry() {
   const result2 = spawnSync8("npm", ["config", "get", "registry"], {
     encoding: "utf8",
-    stdio: ["ignore", "pipe", "pipe"]
+    stdio: ["ignore", "pipe", "pipe"],
+    // On Windows, `npm` is actually `npm.cmd`; without a shell spawnSync
+    // cannot resolve it (ENOENT) and result.stdout/stderr are null.
+    shell: process.platform === "win32"
   });
   if (result2.error || typeof result2.status === "number" && result2.status !== 0) {
     console.warn("Unable to check npm registry before updating. Continuing anyway.");
     return null;
   }
-  return result2.stdout.trim();
+  return (result2.stdout ?? "").trim();
 }
 function warnIfUsingMirrorRegistry() {
   const registry2 = getNpmRegistry();
@@ -558450,7 +558627,11 @@ function runNpmStep(step) {
   console.log(`
 ${step.label}...`);
   const result2 = spawnSync8("npm", step.args, {
-    stdio: "inherit"
+    stdio: "inherit",
+    // On Windows, `npm` is actually `npm.cmd`; without a shell spawnSync
+    // cannot resolve it (ENOENT), aborting the update with
+    // "spawnSync npm ENOENT".
+    shell: process.platform === "win32"
   });
   if (result2.error) {
     console.error(`
@@ -642327,8 +642508,8 @@ var init_HookErrorDisplay = __esm({
 });
 
 // dist/utils/ui/skillMask.js
-function isSkillHeaderLine(line) {
-  return line.startsWith("# Skill:");
+function findSkillHeaderIndex(line) {
+  return line.indexOf("# Skill:");
 }
 function splitSkillEndRemainder(line) {
   const trimmed = line.trimStart();
@@ -642340,7 +642521,9 @@ function isSkillEndLine(line) {
   return line.trim() === "# Skill End";
 }
 function parseSkillIdFromHeader(line) {
-  return line.replace(/^# Skill:\s*/i, "").trim() || "unknown";
+  const headerIndex = findSkillHeaderIndex(line);
+  const headerPart = headerIndex >= 0 ? line.slice(headerIndex) : line;
+  return headerPart.replace(/^# Skill:\s*/i, "").trim() || "unknown";
 }
 function maskSkillInjectedText(text2) {
   if (!text2)
@@ -642351,18 +642534,25 @@ function maskSkillInjectedText(text2) {
   let i = 0;
   while (i < lines.length) {
     const line = lines[i] ?? "";
-    if (!isSkillHeaderLine(line)) {
+    const headerIndex = findSkillHeaderIndex(line);
+    if (headerIndex < 0) {
       out.push(line);
       i++;
       continue;
     }
+    if (headerIndex > 0) {
+      const prefix = line.slice(0, headerIndex).trimEnd();
+      if (prefix.length > 0) {
+        out.push(prefix);
+      }
+    }
     const skillId = parseSkillIdFromHeader(line);
     skillIds.push(skillId);
     out.push(`[Skill:${skillId}]`);
     i++;
     while (i < lines.length) {
       const next = lines[i] ?? "";
-      if (isSkillHeaderLine(next))
+      if (findSkillHeaderIndex(next) >= 0)
         break;
       const remainder = splitSkillEndRemainder(next);
       if (remainder !== null) {
@@ -642388,8 +642578,8 @@ var init_skillMask = __esm({
 });
 
 // dist/utils/ui/gitLineMask.js
-function isGitLineHeaderLine(line) {
-  return line.startsWith("# GitLine:");
+function findGitLineHeaderIndex(line) {
+  return line.indexOf("# GitLine:");
 }
 function isGitLineEndLine(line) {
   return line.trim() === "# GitLine End";
@@ -642401,7 +642591,9 @@ function splitGitLineEndRemainder(line) {
   return trimmed.slice("# GitLine End".length);
 }
 function parseGitLineIdFromHeader(line) {
-  const id = line.replace(/^# GitLine:\s*/i, "").trim() || "unknown";
+  const headerIndex = findGitLineHeaderIndex(line);
+  const headerPart = headerIndex >= 0 ? line.slice(headerIndex) : line;
+  const id = headerPart.replace(/^# GitLine:\s*/i, "").trim() || "unknown";
   return id.slice(0, 8);
 }
 function maskGitLineText(text2) {
@@ -642413,18 +642605,25 @@ function maskGitLineText(text2) {
   let i = 0;
   while (i < lines.length) {
     const line = lines[i] ?? "";
-    if (!isGitLineHeaderLine(line)) {
+    const headerIndex = findGitLineHeaderIndex(line);
+    if (headerIndex < 0) {
       out.push(line);
       i++;
       continue;
     }
+    if (headerIndex > 0) {
+      const prefix = line.slice(0, headerIndex).trimEnd();
+      if (prefix.length > 0) {
+        out.push(prefix);
+      }
+    }
     const gitLineId = parseGitLineIdFromHeader(line);
     gitLineIds.push(gitLineId);
     out.push(`[GitLine:${gitLineId}]`);
     i++;
     while (i < lines.length) {
       const next = lines[i] ?? "";
-      if (isGitLineHeaderLine(next))
+      if (findGitLineHeaderIndex(next) >= 0)
         break;
       const remainder = splitGitLineEndRemainder(next);
       if (remainder !== null) {
@@ -645988,6 +646187,10 @@ var init_textBuffer = __esm({
         while ((m = bracketPattern.exec(text2)) !== null) {
           pushRange(m.index, m.index + m[0].length, "bracket");
         }
+        const wsTagPattern = /@\[[^\]]+\]/g;
+        while ((m = wsTagPattern.exec(text2)) !== null) {
+          pushRange(m.index, m.index + m[0].length, "wsTag");
+        }
         const agentPattern = /(^|\s)(#[A-Za-z][\w-]*)/g;
         while ((m = agentPattern.exec(text2)) !== null) {
           const leading = m[1] ?? "";
@@ -646562,7 +646765,7 @@ var init_textBuffer = __esm({
               const hasTrailingSpace = codePoints[closePos + 1] === " ";
               const placeholderText = hasTrailingSpace ? `${baseText} ` : baseText;
               const end = hasTrailingSpace ? closePos + 2 : closePos + 1;
-              if (placeholderText.match(/^\[Paste \d+ lines #\d+\] ?$/) || placeholderText.match(/^\[image #\d+\] ?$/) || placeholderText === "[Pasting...]" || placeholderText === "[Pasting...] " || placeholderText.match(/^\[Skill:[^\]]+\] ?$/)) {
+              if (placeholderText.match(/^\[Paste \d+ lines #\d+\] ?$/) || placeholderText.match(/^\[image #\d+\] ?$/) || placeholderText === "[Pasting...]" || placeholderText === "[Pasting...] " || placeholderText.match(/^\[Skill:[^\]]+\] ?$/) || placeholderText.match(/^\[GitLine:[^\]]+\] ?$/)) {
                 return { start: openPos, end };
               }
             }
@@ -647035,7 +647238,23 @@ function getCommandArgsOptions(commandName, inputText) {
   if (commandName === "buddy" && /^\/buddy\s+profile\s*$/.test(inputText ?? "")) {
     return getBuddyProfileArgOptions();
   }
-  return COMMAND_ARGS_OPTIONS[commandName] ?? [];
+  const staticOptions = COMMAND_ARGS_OPTIONS[commandName];
+  if (staticOptions) {
+    return staticOptions;
+  }
+  const customCmd = getCustomCommands().find((cmd) => cmd.name === commandName);
+  if ((customCmd == null ? void 0 : customCmd.argsOptions) && customCmd.argsOptions.length > 0) {
+    return customCmd.argsOptions;
+  }
+  return [];
+}
+function getCommandArgsHint(commandName) {
+  const staticHint = COMMAND_ARGS_HINTS[commandName];
+  if (staticHint) {
+    return staticHint;
+  }
+  const customCmd = getCustomCommands().find((cmd) => cmd.name === commandName);
+  return (customCmd == null ? void 0 : customCmd.argsHint) ?? "";
 }
 function useCommandPanel(buffer, isProcessing = false) {
   const { t } = useI18n();
@@ -647445,7 +647664,8 @@ function filePickerReducer(state, action) {
         fileSelectedIndex: 0,
         fileQuery: action.query,
         atSymbolPosition: action.position,
-        searchMode: action.searchMode
+        searchMode: action.searchMode,
+        workspaceFilter: action.workspaceFilter !== void 0 ? action.workspaceFilter : state.workspaceFilter
       };
     case "HIDE":
       return {
@@ -647453,7 +647673,8 @@ function filePickerReducer(state, action) {
         showFilePicker: false,
         fileSelectedIndex: 0,
         fileQuery: "",
-        atSymbolPosition: -1
+        atSymbolPosition: -1,
+        workspaceFilter: null
       };
     case "SELECT_FILE":
       return {
@@ -647461,7 +647682,8 @@ function filePickerReducer(state, action) {
         showFilePicker: false,
         fileSelectedIndex: 0,
         fileQuery: "",
-        atSymbolPosition: -1
+        atSymbolPosition: -1,
+        workspaceFilter: null
       };
     case "SET_SELECTED_INDEX":
       return {
@@ -647484,7 +647706,8 @@ function useFilePicker(buffer, triggerUpdate) {
     fileQuery: "",
     atSymbolPosition: -1,
     filteredFileCount: 0,
-    searchMode: "file"
+    searchMode: "file",
+    workspaceFilter: null
   });
   const fileListRef = (0, import_react98.useRef)(null);
   const updateFilePickerState = (0, import_react98.useCallback)((_text, cursorPos) => {
@@ -647554,24 +647777,38 @@ function useFilePicker(buffer, triggerUpdate) {
     state.atSymbolPosition,
     state.searchMode
   ]);
-  const handleFileSelect = (0, import_react98.useCallback)(async (filePath) => {
+  const handleFileSelect = (0, import_react98.useCallback)(async (filePath, displayName) => {
     if (state.atSymbolPosition !== -1) {
       const displayText = buffer.text;
       const cursorPos = buffer.getCursorPosition();
+      const isWorkspaceSelection = state.fileQuery.startsWith(":");
       const beforeAt = displayText.slice(0, state.atSymbolPosition);
       const afterCursor = displayText.slice(cursorPos);
       const prefix = state.searchMode === "content" ? "@@" : "@";
+      if (isWorkspaceSelection) {
+        const tag2 = displayName || filePath.replace(/\/$/, "").split("/").pop() || filePath;
+        const tagText = `${prefix}[${tag2}]`;
+        const newText2 = beforeAt + tagText + afterCursor;
+        buffer.setText(newText2);
+        const targetPos2 = state.atSymbolPosition + tagText.length;
+        buffer.setCursorPosition(targetPos2);
+        dispatch({
+          type: "SHOW",
+          query: "",
+          position: state.atSymbolPosition,
+          searchMode: state.searchMode,
+          workspaceFilter: filePath
+        });
+        triggerUpdate();
+        return;
+      }
       const isDirectoryContinuation = state.searchMode === "file" && filePath.endsWith("/");
       const suffix = isDirectoryContinuation ? "" : " ";
       const newText = beforeAt + prefix + filePath + suffix + afterCursor;
       buffer.setText(newText);
       const insertedLength = prefix.length + filePath.length + suffix.length;
       const targetPos = state.atSymbolPosition + insertedLength;
-      for (let i = 0; i < targetPos; i++) {
-        if (i < buffer.text.length) {
-          buffer.moveRight();
-        }
-      }
+      buffer.setCursorPosition(targetPos);
       if (isDirectoryContinuation) {
         dispatch({
           type: "SHOW",
@@ -647584,7 +647821,13 @@ function useFilePicker(buffer, triggerUpdate) {
       }
       triggerUpdate();
     }
-  }, [state.atSymbolPosition, state.searchMode, buffer, triggerUpdate]);
+  }, [
+    state.atSymbolPosition,
+    state.searchMode,
+    state.fileQuery,
+    buffer,
+    triggerUpdate
+  ]);
   const handleMultipleFileSelect = (0, import_react98.useCallback)(async (filePaths) => {
     if (filePaths.length === 0) {
       return;
@@ -647601,11 +647844,7 @@ function useFilePicker(buffer, triggerUpdate) {
     const newText = beforeAt + insertedSegment + afterCursor;
     buffer.setText(newText);
     const targetPos = state.atSymbolPosition + insertedSegment.length;
-    for (let i = 0; i < targetPos; i++) {
-      if (i < buffer.text.length) {
-        buffer.moveRight();
-      }
-    }
+    buffer.setCursorPosition(targetPos);
     dispatch({ type: "SELECT_FILE" });
     triggerUpdate();
   }, [state.atSymbolPosition, state.searchMode, buffer, triggerUpdate]);
@@ -647647,6 +647886,7 @@ function useFilePicker(buffer, triggerUpdate) {
     },
     filteredFileCount: state.filteredFileCount,
     searchMode: state.searchMode,
+    workspaceFilter: state.workspaceFilter,
     updateFilePickerState,
     handleFileSelect,
     handleMultipleFileSelect,
@@ -648553,7 +648793,7 @@ function argsPickerHandler(ctx) {
       if (selected) {
         const value = getCommandArgOptionValue(selected);
         const text2 = buffer.text;
-        const hasTrailingSpace = /^\/[a-zA-Z0-9_-]+(?:\s+\S+)*\s+$/.test(text2);
+        const hasTrailingSpace = /^\/[a-zA-Z0-9_:-]+(?:\s+\S+)*\s+$/.test(text2);
         const suffix = hasTrailingSpace ? value : " " + value;
         buffer.insert(suffix);
         buffer.setCursorPosition(buffer.text.length);
@@ -649127,7 +649367,7 @@ var init_deleteAndBackspace = __esm({
 
 // dist/hooks/input/keyboard/handlers/pickers/filePicker.js
 function filePickerHandler(ctx) {
-  var _a20, _b14, _c6, _d4, _e2, _f, _g, _h, _i;
+  var _a20, _b14, _c6, _d4, _e2, _f, _g, _h, _i, _j, _k;
   const { input: input2, key, options: options3 } = ctx;
   const { showFilePicker, filteredFileCount, fileSelectedIndex, setFileSelectedIndex, fileListRef, handleFileSelect, handleMultipleFileSelect } = options3;
   if (!showFilePicker)
@@ -649168,7 +649408,8 @@ function filePickerHandler(ctx) {
       }
       const selectedFile = (_i = fileListRef.current) == null ? void 0 : _i.getSelectedFile();
       if (selectedFile) {
-        handleFileSelect(selectedFile);
+        const displayName = (_k = (_j = fileListRef.current) == null ? void 0 : _j.getSelectedDisplayName) == null ? void 0 : _k.call(_j);
+        handleFileSelect(selectedFile, displayName ?? void 0);
       }
     }
     return true;
@@ -649344,7 +649585,7 @@ function tabArgsPickerHandler(ctx) {
   const { showCommands, showFilePicker, showArgsPicker, setShowArgsPicker, setArgsSelectedIndex } = options3;
   if (key.tab && !showCommands && !showFilePicker && !showArgsPicker) {
     const text2 = buffer.text;
-    const rootMatch = text2.match(/^\/([a-zA-Z0-9_-]+)\s*$/);
+    const rootMatch = text2.match(/^\/([a-zA-Z0-9_:-]+)\s*$/);
     const buddyProfileMatch = text2.match(/^\/(buddy)\s+profile\s*$/);
     const inlineTrigger = findInlineCommandTrigger(text2, buffer.getCursorPosition());
     const cmdName = (rootMatch == null ? void 0 : rootMatch[1]) ?? (buddyProfileMatch == null ? void 0 : buddyProfileMatch[1]) ?? (inlineTrigger == null ? void 0 : inlineTrigger.query) ?? "";
@@ -650395,21 +650636,46 @@ function createStagedEntry(fileCount) {
     fileCount
   };
 }
+function createUnstagedEntry(fileCount) {
+  return {
+    sha: UNSTAGED_ENTRY_SHA,
+    subject: "Unstaged changes",
+    authorName: "",
+    dateIso: "",
+    kind: "unstaged",
+    fileCount
+  };
+}
 function buildInjectedGitLineText(commit, gitRoot) {
-  const patch = commit.kind === "staged" ? reviewAgent.getStagedDiff(gitRoot).trim() : reviewAgent.getCommitPatch(gitRoot, commit.sha).trim();
   if (commit.kind === "staged") {
+    const patch2 = reviewAgent.getStagedDiff(gitRoot).trim();
     return [
       "# GitLine: staged",
       "Type: staged",
       commit.fileCount !== void 0 ? `Files: ${commit.fileCount}` : void 0,
       "",
       "```git",
-      patch,
+      patch2,
+      "```",
+      "# GitLine End",
+      ""
+    ].filter((line) => line !== void 0).join("\n");
+  }
+  if (commit.kind === "unstaged") {
+    const patch2 = reviewAgent.getUnstagedDiff(gitRoot).trim();
+    return [
+      "# GitLine: unstaged",
+      "Type: unstaged",
+      commit.fileCount !== void 0 ? `Files: ${commit.fileCount}` : void 0,
+      "",
+      "```git",
+      patch2,
       "```",
       "# GitLine End",
       ""
     ].filter((line) => line !== void 0).join("\n");
   }
+  const patch = reviewAgent.getCommitPatch(gitRoot, commit.sha).trim();
   return [
     `# GitLine: ${commit.sha}`,
     `Commit: ${commit.sha}`,
@@ -650429,6 +650695,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
   const [gitLineSelectedIndex, setGitLineSelectedIndex] = (0, import_react106.useState)(0);
   const [commits, setCommits] = (0, import_react106.useState)([]);
   const [stagedEntry, setStagedEntry] = (0, import_react106.useState)(null);
+  const [unstagedEntry, setUnstagedEntry] = (0, import_react106.useState)(null);
   const [selectedCommits, setSelectedCommits] = (0, import_react106.useState)(/* @__PURE__ */ new Set());
   const [isLoading, setIsLoading] = (0, import_react106.useState)(false);
   const [isLoadingMore, setIsLoadingMore] = (0, import_react106.useState)(false);
@@ -650439,8 +650706,15 @@ function useGitLinePicker(buffer, triggerUpdate) {
   const [gitRoot, setGitRoot] = (0, import_react106.useState)(null);
   const [insertionRange, setInsertionRange] = (0, import_react106.useState)(null);
   const allCommits = (0, import_react106.useMemo)(() => {
-    return stagedEntry ? [stagedEntry, ...commits] : commits;
-  }, [commits, stagedEntry]);
+    const entries = [];
+    if (stagedEntry) {
+      entries.push(stagedEntry);
+    }
+    if (unstagedEntry) {
+      entries.push(unstagedEntry);
+    }
+    return [...entries, ...commits];
+  }, [commits, stagedEntry, unstagedEntry]);
   const filteredCommits = (0, import_react106.useMemo)(() => {
     const query = searchQuery.trim().toLowerCase();
     if (!query) {
@@ -650456,6 +650730,9 @@ function useGitLinePicker(buffer, triggerUpdate) {
       if (commit.kind === "staged") {
         searchableFields.push("staged", "staged changes");
       }
+      if (commit.kind === "unstaged") {
+        searchableFields.push("unstaged", "unstaged changes");
+      }
       return searchableFields.some((field) => field.toLowerCase().includes(query));
     });
   }, [allCommits, searchQuery]);
@@ -650469,6 +650746,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
         setGitRoot(null);
         setCommits([]);
         setStagedEntry(null);
+        setUnstagedEntry(null);
         setHasMore(false);
         setSkip(0);
         setError(gitCheck.error || "Not a git repository");
@@ -650478,6 +650756,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
       const result2 = reviewAgent.listCommitsPaginated(gitCheck.gitRoot, 0, PAGE_SIZE);
       setGitRoot(gitCheck.gitRoot);
       setStagedEntry(status.hasStaged ? createStagedEntry(status.stagedFileCount) : null);
+      setUnstagedEntry(status.hasUnstaged ? createUnstagedEntry(status.unstagedFileCount) : null);
       setCommits(result2.commits.map((commit) => ({
         ...commit,
         kind: "commit"
@@ -650489,6 +650768,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
       setGitRoot(null);
       setCommits([]);
       setStagedEntry(null);
+      setUnstagedEntry(null);
       setHasMore(false);
       setSkip(0);
       setError(loadError instanceof Error ? loadError.message : "Failed to load git commits");
@@ -650563,6 +650843,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
     setSkip(0);
     setIsLoadingMore(false);
     setStagedEntry(null);
+    setUnstagedEntry(null);
     setInsertionRange(null);
     triggerUpdate();
   }, [triggerUpdate]);
@@ -650616,6 +650897,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
     setSkip(0);
     setIsLoadingMore(false);
     setStagedEntry(null);
+    setUnstagedEntry(null);
     setInsertionRange(null);
     triggerUpdate();
   }, [
@@ -650649,7 +650931,7 @@ function useGitLinePicker(buffer, triggerUpdate) {
     loadMoreGitLineCommits
   };
 }
-var import_react106, PAGE_SIZE, STAGED_ENTRY_SHA;
+var import_react106, PAGE_SIZE, STAGED_ENTRY_SHA, UNSTAGED_ENTRY_SHA;
 var init_useGitLinePicker = __esm({
   "dist/hooks/picker/useGitLinePicker.js"() {
     "use strict";
@@ -650657,6 +650939,7 @@ var init_useGitLinePicker = __esm({
     init_reviewAgent();
     PAGE_SIZE = 30;
     STAGED_ENTRY_SHA = "staged";
+    UNSTAGED_ENTRY_SHA = "unstaged";
   }
 });
 
@@ -652046,7 +652329,7 @@ __export(FileList_exports, {
 });
 import fs55 from "fs";
 import path64 from "path";
-var import_react111, SEARCH_RESULT_TTL_MS, getDisplayItemKey, getNormalizedItemPath, getLookupKey, getRelativeTreePath, getTreeDepth, compareTreeItems, buildTreeDisplayItems, getFullFilePath, AGENT_PREVIEW_VIEWPORT_HEIGHT, AGENT_PREVIEW_INDENT_WIDTH, AGENT_PREVIEW_RESERVED_COLUMNS, AGENT_PREVIEW_PANEL_PADDING, normalizeAgentPreviewContent, sliceByVisualWidth, getSafeAgentPreviewLineWidth, buildAgentPreviewLines, buildSafeAgentPreviewTitle, FileList, FileList_default;
+var import_react111, SEARCH_RESULT_TTL_MS, getDisplayItemKey, getNormalizedItemPath, getLookupKey, getRelativeTreePath, getTreeDepth, getSourceDirName, compareTreeItems, buildTreeDisplayItems, getFullFilePath, AGENT_PREVIEW_VIEWPORT_HEIGHT, AGENT_PREVIEW_INDENT_WIDTH, AGENT_PREVIEW_RESERVED_COLUMNS, AGENT_PREVIEW_PANEL_PADDING, normalizeAgentPreviewContent, sliceByVisualWidth, getSafeAgentPreviewLineWidth, buildAgentPreviewLines, buildSafeAgentPreviewTitle, FileList, FileList_default;
 var init_FileList = __esm({
   async "dist/ui/components/tools/FileList.js"() {
     "use strict";
@@ -652077,6 +652360,16 @@ var init_FileList = __esm({
       }
       return relativePath.split("/").filter(Boolean).length;
     };
+    getSourceDirName = (sourceDir) => {
+      if (sourceDir.startsWith("ssh://")) {
+        const sshInfo = parseSSHUrl(sourceDir);
+        if (sshInfo) {
+          return sshInfo.path.split("/").pop() || sshInfo.host;
+        }
+        return sourceDir;
+      }
+      return path64.basename(sourceDir) || sourceDir;
+    };
     compareTreeItems = (a, b) => {
       const sourceCompare = (a.sourceDir || "").localeCompare(b.sourceDir || "");
       if (sourceCompare !== 0) {
@@ -652202,7 +652495,7 @@ var init_FileList = __esm({
     buildSafeAgentPreviewTitle = (title, terminalWidth) => {
       return sliceByVisualWidth(title, Math.max(1, terminalWidth - 1)) || " ";
     };
-    FileList = (0, import_react111.memo)((0, import_react111.forwardRef)(({ query, selectedIndex, visible, maxItems = 10, rootPath = process.cwd(), onFilteredCountChange, searchMode = "file" }, ref) => {
+    FileList = (0, import_react111.memo)((0, import_react111.forwardRef)(({ query, selectedIndex, visible, maxItems = 10, rootPath = process.cwd(), onFilteredCountChange, searchMode = "file", workspaceFilter = null }, ref) => {
       const { t } = useI18n();
       const { theme: theme14 } = useTheme();
       const [files, setFiles] = (0, import_react111.useState)([]);
@@ -652221,7 +652514,9 @@ var init_FileList = __esm({
       const [agentError, setAgentError] = (0, import_react111.useState)(null);
       const agentAbortRef = (0, import_react111.useRef)(null);
       const wasAgentModeRef = (0, import_react111.useRef)(false);
-      const isAgentMode = query.startsWith("??");
+      const isWorkspaceSelectionMode = query.startsWith(":");
+      const normalizedQuery = isWorkspaceSelectionMode ? "" : workspaceFilter && query.startsWith("[") ? query.replace(/^\[[^\]]*\]/, "") : query;
+      const isAgentMode = normalizedQuery.startsWith("??");
       const { columns: terminalWidth } = useTerminalSize();
       const agentPreviewLabels = (0, import_react111.useMemo)(() => ({
         assistantPrefix: t.fileList.agentPreviewAssistantPrefix,
@@ -652249,7 +652544,8 @@ var init_FileList = __esm({
         return maxItems ? Math.min(maxItems, MAX_DISPLAY_ITEMS2) : MAX_DISPLAY_ITEMS2;
       }, [maxItems]);
       const loadFiles = (0, import_react111.useCallback)(async () => {
-        const workingDirs = await getWorkingDirectories();
+        const allDirs = await getWorkingDirectories();
+        const workingDirs = workspaceFilter ? allDirs.filter((d) => d.path === workspaceFilter || d.path === workspaceFilter.replace(/\/$/, "")) : allDirs;
         const collected = [];
         let depthLimitHit = false;
         const FLUSH_INTERVAL_MS = 80;
@@ -652401,7 +652697,7 @@ var init_FileList = __esm({
         flush(true);
         setHasMoreDepth(depthLimitHit);
         setIsLoading(false);
-      }, [searchDepth]);
+      }, [searchDepth, workspaceFilter]);
       const searchFileContent = (0, import_react111.useCallback)(async (query2) => {
         if (!query2.trim()) {
           return [];
@@ -652469,6 +652765,39 @@ var init_FileList = __esm({
         loadFiles();
       }, [visible, rootPath, loadFiles]);
       const [allFilteredFiles, setAllFilteredFiles] = (0, import_react111.useState)([]);
+      const [workspaceDirs, setWorkspaceDirs] = (0, import_react111.useState)([]);
+      (0, import_react111.useEffect)(() => {
+        if (!visible || !isWorkspaceSelectionMode) {
+          return;
+        }
+        let cancelled = false;
+        (async () => {
+          const dirs = await getWorkingDirectories();
+          if (cancelled)
+            return;
+          const items = dirs.map((dir) => {
+            const dirName = dir.displayName || getSourceDirName(dir.path);
+            return {
+              name: dirName,
+              path: dir.path.endsWith("/") ? dir.path : `${dir.path}/`,
+              isDirectory: true,
+              sourceDir: dir.path
+            };
+          });
+          setWorkspaceDirs(items);
+        })();
+        return () => {
+          cancelled = true;
+        };
+      }, [visible, isWorkspaceSelectionMode]);
+      const filteredWorkspaceDirs = (0, import_react111.useMemo)(() => {
+        if (!isWorkspaceSelectionMode)
+          return [];
+        const filterText = query.slice(1).toLowerCase();
+        if (!filterText)
+          return workspaceDirs;
+        return workspaceDirs.filter((dir) => dir.name.toLowerCase().includes(filterText) || (dir.sourceDir || "").toLowerCase().includes(filterText));
+      }, [isWorkspaceSelectionMode, query, workspaceDirs]);
       (0, import_react111.useEffect)(() => {
         if (visible) {
           return;
@@ -652488,20 +652817,20 @@ var init_FileList = __esm({
           return;
         }
         const performSearch = async () => {
-          if (!query.trim()) {
+          if (!normalizedQuery.trim()) {
             setAllFilteredFiles(files);
             return;
           }
           if (searchMode === "content") {
-            const results = await searchFileContent(query);
+            const results = await searchFileContent(normalizedQuery);
             setAllFilteredFiles(results);
-            if (!isLoading && results.length === 0 && query.trim().length > 0 && hasMoreDepth) {
+            if (!isLoading && results.length === 0 && normalizedQuery.trim().length > 0 && hasMoreDepth) {
               setSearchDepth((d) => d + 3);
               setIsIncreasingDepth(true);
               setTimeout(() => setIsIncreasingDepth(false), 400);
             }
           } else {
-            const queryLower = query.toLowerCase().replace(/\\/g, "/");
+            const queryLower = normalizedQuery.toLowerCase().replace(/\\/g, "/");
             const filtered = files.filter((file2) => {
               const fileName = file2.name.toLowerCase();
               const filePath = file2.path.toLowerCase().replace(/\\/g, "/");
@@ -652532,7 +652861,7 @@ var init_FileList = __esm({
               return a.name.localeCompare(b.name);
             });
             setAllFilteredFiles(filtered);
-            if (!isLoading && filtered.length === 0 && query.trim().length > 0 && hasMoreDepth) {
+            if (!isLoading && filtered.length === 0 && normalizedQuery.trim().length > 0 && hasMoreDepth) {
               setSearchDepth((d) => d + 3);
               setIsIncreasingDepth(true);
               setTimeout(() => setIsIncreasingDepth(false), 400);
@@ -652546,7 +652875,7 @@ var init_FileList = __esm({
         return () => clearTimeout(timer2);
       }, [
         files,
-        query,
+        normalizedQuery,
         searchMode,
         searchFileContent,
         isLoading,
@@ -652555,7 +652884,7 @@ var init_FileList = __esm({
         agentResults
       ]);
       (0, import_react111.useEffect)(() => {
-        const agentQuery = isAgentMode ? query.slice(2).trim() : "";
+        const agentQuery = isAgentMode ? normalizedQuery.slice(2).trim() : "";
         if (!visible || !isAgentMode || !agentQuery) {
           if (wasAgentModeRef.current) {
             wasAgentModeRef.current = false;
@@ -652589,7 +652918,8 @@ var init_FileList = __esm({
           setAgentRound(0);
           setAgentPreviewContent("");
           try {
-            const workingDirs = await getWorkingDirectories();
+            const allDirs = await getWorkingDirectories();
+            const workingDirs = workspaceFilter ? allDirs.filter((d) => d.path === workspaceFilter || d.path === workspaceFilter.replace(/\/$/, "")) : allDirs;
             const generator = fileSearchAgent.search(agentQuery, searchMode, workingDirs, controller.signal, agentPreviewLabels);
             for await (const event of generator) {
               if (controller.signal.aborted) {
@@ -652621,7 +652951,14 @@ var init_FileList = __esm({
           clearTimeout(timer2);
           controller.abort();
         };
-      }, [query, searchMode, visible, isAgentMode, agentPreviewLabels]);
+      }, [
+        normalizedQuery,
+        searchMode,
+        visible,
+        isAgentMode,
+        agentPreviewLabels,
+        workspaceFilter
+      ]);
       const displayItems = (0, import_react111.useMemo)(() => {
         if (isAgentMode || searchMode === "content") {
           return allFilteredFiles.map((file2) => ({
@@ -652632,7 +652969,7 @@ var init_FileList = __esm({
           }));
         }
         if (displayMode === "tree") {
-          return buildTreeDisplayItems(allFilteredFiles, files, query);
+          return buildTreeDisplayItems(allFilteredFiles, files, normalizedQuery);
         }
         return allFilteredFiles.map((file2) => ({
           file: file2,
@@ -652645,7 +652982,7 @@ var init_FileList = __esm({
         files,
         displayMode,
         searchMode,
-        query,
+        normalizedQuery,
         isAgentMode
       ]);
       const normalizedSelectedIndex = (0, import_react111.useMemo)(() => {
@@ -652679,9 +653016,15 @@ var init_FileList = __esm({
       const hiddenBelowCount = Math.max(0, displayItems.length - fileWindow.endIndex);
       (0, import_react111.useEffect)(() => {
         if (onFilteredCountChange) {
-          onFilteredCountChange(displayItems.length);
+          const count = isWorkspaceSelectionMode ? filteredWorkspaceDirs.length : displayItems.length;
+          onFilteredCountChange(count);
         }
-      }, [displayItems.length, onFilteredCountChange]);
+      }, [
+        displayItems.length,
+        onFilteredCountChange,
+        isWorkspaceSelectionMode,
+        filteredWorkspaceDirs.length
+      ]);
       const resolveInsertionPath = (0, import_react111.useCallback)((entry) => {
         if (!entry) {
           return null;
@@ -652698,12 +653041,25 @@ var init_FileList = __esm({
       }, [rootPath, searchMode]);
       (0, import_react111.useImperativeHandle)(ref, () => ({
         getSelectedFile: () => {
+          if (isWorkspaceSelectionMode) {
+            const wsIndex = Math.min(selectedIndex, Math.max(0, filteredWorkspaceDirs.length - 1));
+            const wsItem = filteredWorkspaceDirs[wsIndex];
+            return wsItem ? wsItem.path : null;
+          }
           const selectedEntry = displayItems[normalizedSelectedIndex];
           if (!selectedEntry) {
             return null;
           }
           return resolveInsertionPath(selectedEntry);
         },
+        getSelectedDisplayName: () => {
+          if (isWorkspaceSelectionMode) {
+            const wsIndex = Math.min(selectedIndex, Math.max(0, filteredWorkspaceDirs.length - 1));
+            const wsItem = filteredWorkspaceDirs[wsIndex];
+            return wsItem ? wsItem.name : null;
+          }
+          return null;
+        },
         toggleDisplayMode: () => {
           if (searchMode !== "file") {
             return false;
@@ -652776,7 +653132,10 @@ var init_FileList = __esm({
         isIncreasingDepth,
         displayMode,
         selectedKeys,
-        resolveInsertionPath
+        resolveInsertionPath,
+        isWorkspaceSelectionMode,
+        filteredWorkspaceDirs,
+        selectedIndex
       ]);
       const displaySelectedIndex = filteredFiles.length === 0 ? -1 : normalizedSelectedIndex - fileWindow.startIndex;
       const selectedFileFullPath = (0, import_react111.useMemo)(() => {
@@ -652789,6 +653148,47 @@ var init_FileList = __esm({
       if (!visible) {
         return null;
       }
+      if (isWorkspaceSelectionMode) {
+        const wsItems = filteredWorkspaceDirs;
+        const wsSelectedIndex = Math.min(selectedIndex, Math.max(0, wsItems.length - 1));
+        const wsWindow = wsItems.slice(0, effectiveMaxItems);
+        if (wsItems.length === 0) {
+          return import_react111.default.createElement(
+            Box_default,
+            { paddingX: 1, marginTop: 1 },
+            import_react111.default.createElement(Text, { color: theme14.colors.menuSecondary, dimColor: true }, t.fileList.noFilesFound)
+          );
+        }
+        return import_react111.default.createElement(
+          Box_default,
+          { paddingX: 1, marginTop: 1, flexDirection: "column" },
+          import_react111.default.createElement(
+            Box_default,
+            { marginBottom: 1 },
+            import_react111.default.createElement(Text, { color: theme14.colors.menuInfo, bold: true }, t.fileList.workspaceFilterHint.replace("{filter}", query.slice(1) || "*"))
+          ),
+          wsWindow.map((item, index) => {
+            const isSelected = index === wsSelectedIndex;
+            return import_react111.default.createElement(
+              Text,
+              { key: `${item.sourceDir}::${item.path}`, backgroundColor: isSelected ? theme14.colors.menuSelected : void 0, color: isSelected ? theme14.colors.menuNormal : theme14.colors.warning, wrap: "truncate-end" },
+              isSelected ? "\u276F " : "  ",
+              "\u25C7 ",
+              item.name
+            );
+          }),
+          wsItems.length > effectiveMaxItems && import_react111.default.createElement(
+            Box_default,
+            { marginTop: 1 },
+            import_react111.default.createElement(
+              Text,
+              { color: theme14.colors.menuSecondary, dimColor: true },
+              t.commandPanel.scrollHint,
+              t.commandPanel.moreBelow.replace("{count}", (wsItems.length - effectiveMaxItems).toString())
+            )
+          )
+        );
+      }
       if (isAgentMode) {
         if (isAgentSearching && displayItems.length === 0) {
           const agentSearchStatus = t.fileList.agentSearching.replace("{round}", String(agentRound || 1));
@@ -652824,12 +653224,12 @@ var init_FileList = __esm({
           );
         }
       }
-      const stillSearching = isLoading || isIncreasingDepth || query.trim().length > 0 && hasMoreDepth;
+      const stillSearching = isLoading || isIncreasingDepth || normalizedQuery.trim().length > 0 && hasMoreDepth;
       if (!isAgentMode && stillSearching && displayItems.length === 0) {
         return import_react111.default.createElement(
           Box_default,
           { paddingX: 1, marginTop: 1 },
-          import_react111.default.createElement(Text, { color: "blue", dimColor: true }, isIncreasingDepth || query.trim().length > 0 && hasMoreDepth ? t.fileList.searchingDeeper.replace("{depth}", searchDepth.toString()) : t.fileList.loadingFiles)
+          import_react111.default.createElement(Text, { color: "blue", dimColor: true }, isIncreasingDepth || normalizedQuery.trim().length > 0 && hasMoreDepth ? t.fileList.searchingDeeper.replace("{depth}", searchDepth.toString()) : t.fileList.loadingFiles)
         );
       }
       if (displayItems.length === 0) {
@@ -652853,6 +653253,11 @@ var init_FileList = __esm({
             displayItems.length > effectiveMaxItems && `(${normalizedSelectedIndex + 1}/${displayItems.length})`
           )
         ),
+        workspaceFilter && !isWorkspaceSelectionMode && import_react111.default.createElement(
+          Box_default,
+          null,
+          import_react111.default.createElement(Text, { color: theme14.colors.menuInfo, bold: true }, t.fileList.workspaceFilterHint.replace("{filter}", getSourceDirName(workspaceFilter)))
+        ),
         filteredFiles.map((item, index) => {
           const file2 = item.file;
           const isSelected = index === displaySelectedIndex;
@@ -653440,8 +653845,7 @@ var init_GitLinePickerPanel = __esm({
           Text,
           { color: theme14.colors.menuInfo },
           t.gitLinePickerPanel.selectedLabel,
-          ":",
-          " ",
+          ": ",
           selectedCommits.size
         )
       ) : void 0, scrollHintFormat: (above, below) => import_react115.default.createElement(
@@ -653470,8 +653874,9 @@ var init_GitLinePickerPanel = __esm({
         )
       ), renderItem: (commit, isSelected) => {
         const isChecked = selectedCommits.has(commit.sha);
-        const title = commit.kind === "staged" ? `${t.reviewCommitPanel.stagedLabel} (${commit.fileCount ?? 0} ${t.reviewCommitPanel.filesLabel})` : `${formatShortSha(commit.sha)} ${truncateText2(commit.subject, 72)}`;
-        const subtitle = commit.kind === "staged" ? "" : `${commit.authorName} \xB7 ${formatDate(commit.dateIso)}`;
+        const isWorkingTreeEntry = commit.kind === "staged" || commit.kind === "unstaged";
+        const title = isWorkingTreeEntry ? `${commit.kind === "staged" ? t.reviewCommitPanel.stagedLabel : t.reviewCommitPanel.unstagedLabel} (${commit.fileCount ?? 0} ${t.reviewCommitPanel.filesLabel})` : `${formatShortSha(commit.sha)} ${truncateText2(commit.subject, 72)}`;
+        const subtitle = isWorkingTreeEntry ? "" : `${commit.authorName} \xB7 ${formatDate(commit.dateIso)}`;
         return import_react115.default.createElement(
           import_react115.default.Fragment,
           null,
@@ -654003,13 +654408,13 @@ function ChatInput({ onSubmit, onCommand, placeholder = "Type your message...",
   const [argsSelectedIndex, setArgsSelectedIndex] = import_react120.default.useState(0);
   const argsPickerContext = (0, import_react120.useMemo)(() => {
     const text2 = buffer.text;
-    const rootMatch = text2.match(/^\/([a-zA-Z0-9_-]+)(?:\s+\S+)*\s*$/);
+    const rootMatch = text2.match(/^\/([a-zA-Z0-9_:-]+)(?:\s+\S+)*\s*$/);
     const inlineTrigger = findInlineCommandTrigger(text2, buffer.getCursorPosition());
     const cmd = (rootMatch == null ? void 0 : rootMatch[1]) ?? (inlineTrigger == null ? void 0 : inlineTrigger.query) ?? "";
     const options3 = getCommandArgsOptions(cmd, text2);
     return { commandName: cmd, options: options3 };
   }, [buffer, buffer.text]);
-  const { showFilePicker, setShowFilePicker, fileSelectedIndex, setFileSelectedIndex, fileQuery, setFileQuery, atSymbolPosition, setAtSymbolPosition, filteredFileCount, searchMode, updateFilePickerState, handleFileSelect, handleMultipleFileSelect, handleFilteredCountChange, fileListRef } = useFilePicker(buffer, triggerUpdate);
+  const { showFilePicker, setShowFilePicker, fileSelectedIndex, setFileSelectedIndex, fileQuery, setFileQuery, atSymbolPosition, setAtSymbolPosition, filteredFileCount, searchMode, workspaceFilter, updateFilePickerState, handleFileSelect, handleMultipleFileSelect, handleFilteredCountChange, fileListRef } = useFilePicker(buffer, triggerUpdate);
   const { showHistoryMenu, setShowHistoryMenu, historySelectedIndex, setHistorySelectedIndex, escapeKeyCount, setEscapeKeyCount, escapeKeyTimer, getUserMessages, handleHistorySelect, currentHistoryIndex, navigateHistoryUp, navigateHistoryDown, resetHistoryNavigation, saveToHistory } = useHistoryNavigation(buffer, triggerUpdate, chatHistory, onHistorySelect);
   const { showAgentPicker, setShowAgentPicker, agentSelectedIndex, setAgentSelectedIndex, updateAgentPickerState, getFilteredAgents, handleAgentSelect } = useAgentPicker(buffer, triggerUpdate);
   const { showTodoPicker, setShowTodoPicker, todoSelectedIndex, setTodoSelectedIndex, todos, selectedTodos, toggleTodoSelection, confirmTodoSelection, isLoading: todoIsLoading, searchQuery: todoSearchQuery, setSearchQuery: setTodoSearchQuery, totalTodoCount } = useTodoPicker(buffer, triggerUpdate, process.cwd());
@@ -654319,11 +654724,11 @@ function ChatInput({ onSubmit, onCommand, placeholder = "Type your message...",
     const text2 = buffer.text;
     if (!text2.startsWith("/"))
       return "";
-    const match = text2.match(/^\/([a-zA-Z0-9_-]+)(\s*)$/);
+    const match = text2.match(/^\/([a-zA-Z0-9_:-]+)(\s*)$/);
     if (!match)
       return "";
     const cmd = match[1] ?? "";
-    const hint = COMMAND_ARGS_HINTS[cmd];
+    const hint = getCommandArgsHint(cmd);
     if (!hint)
       return "";
     return match[2] && match[2].length > 0 ? hint : ` ${hint}`;
@@ -654382,7 +654787,7 @@ function ChatInput({ onSubmit, onCommand, placeholder = "Type your message...",
             plainBuf = "";
           }
         };
-        const isPlaceholderTag = (tag2) => /^\[Paste \d+ lines #\d+\]$/.test(tag2) || /^\[image #\d+\]$/.test(tag2) || /^\[Skill:[^\]]+\]$/.test(tag2) || /^\[GitLine:[^\]]+\]$/.test(tag2) || /^\[»[^\]]*\]$/.test(tag2);
+        const isPlaceholderTag = (tag2) => /^\[Paste \d+ lines #\d+\]$/.test(tag2) || /^\[image #\d+\]$/.test(tag2) || /^\[Skill:[^\]]+\]$/.test(tag2) || /^\[GitLine:[^\]]+\]$/.test(tag2) || /^\[»[^\]]*\]$/.test(tag2) || /^\[[^\]]+\]$/.test(tag2);
         let i = 0;
         while (i < line.length) {
           const ch = line[i];
@@ -654408,8 +654813,14 @@ function ChatInput({ onSubmit, onCommand, placeholder = "Type your message...",
             if (closeIdx !== -1) {
               const tagText = line.slice(i, closeIdx + 1);
               if (isPlaceholderTag(tagText)) {
+                const atPrefix = i > 0 && line[i - 1] === "@" ? "@" : "";
+                if (atPrefix) {
+                  if (plainBuf.endsWith("@")) {
+                    plainBuf = plainBuf.slice(0, -1);
+                  }
+                }
                 flushPlain();
-                tokens.push({ text: tagText, highlight: true });
+                tokens.push({ text: atPrefix + tagText, highlight: true });
                 i = closeIdx + 1;
                 continue;
               }
@@ -654528,7 +654939,7 @@ function ChatInput({ onSubmit, onCommand, placeholder = "Type your message...",
         import_react120.default.createElement(
           import_react120.Suspense,
           { fallback: null },
-          import_react120.default.createElement(FileList2, { ref: fileListRef, query: fileQuery, selectedIndex: fileSelectedIndex, visible: showFilePicker, maxItems: 10, rootPath: process.cwd(), onFilteredCountChange: handleFilteredCountChange, searchMode })
+          import_react120.default.createElement(FileList2, { ref: fileListRef, query: fileQuery, selectedIndex: fileSelectedIndex, visible: showFilePicker, maxItems: 10, rootPath: process.cwd(), onFilteredCountChange: handleFilteredCountChange, searchMode, workspaceFilter })
         ),
         import_react120.default.createElement(
           import_react120.Suspense,
@@ -655250,7 +655661,8 @@ function StatusLine({ yoloMode = false, planMode = false, vulnerabilityHuntingMo
         speedometer: {
           enabled: tpsTracker.isActive(),
           tps: tpsSnapshot.tps,
-          peakTps: tpsSnapshot.peakTps
+          peakTps: tpsSnapshot.peakTps,
+          ttftMs: tpsSnapshot.ttftMs
         }
       }
     };
@@ -655474,8 +655886,13 @@ function StatusLine({ yoloMode = false, planMode = false, vulnerabilityHuntingMo
       });
     }
     if (tpsTracker.isActive() && !isBuiltinOverridden(BUILTIN_STATUSLINE_IDS.speedometer)) {
+      let speedometerText = `\u23F1 ${tpsSnapshot.tps} tok/s`;
+      if (tpsSnapshot.ttftMs !== null) {
+        const ttftSec = (tpsSnapshot.ttftMs / 1e3).toFixed(1);
+        speedometerText += ` \xB7 ttft ${ttftSec}s`;
+      }
       statusItems.push({
-        text: `\u23F1 ${tpsSnapshot.tps} tok/s`,
+        text: speedometerText,
         color: tpsSnapshot.tps > 0 ? theme14.colors.cyan : theme14.colors.menuSecondary
       });
     }
@@ -655539,7 +655956,18 @@ function StatusLine({ yoloMode = false, planMode = false, vulnerabilityHuntingMo
         import_react123.default.createElement(Text, { color: tpsSnapshot.tps > 0 ? theme14.colors.cyan : theme14.colors.menuSecondary, bold: true }, tpsSnapshot.tps),
         " tok/s",
         " \xB7 peak ",
-        import_react123.default.createElement(Text, { color: theme14.colors.warning }, tpsSnapshot.peakTps)
+        import_react123.default.createElement(Text, { color: theme14.colors.warning }, tpsSnapshot.peakTps),
+        tpsSnapshot.ttftMs !== null && import_react123.default.createElement(
+          import_react123.default.Fragment,
+          null,
+          " \xB7 ttft ",
+          import_react123.default.createElement(
+            Text,
+            { color: theme14.colors.menuInfo },
+            (tpsSnapshot.ttftMs / 1e3).toFixed(1),
+            "s"
+          )
+        )
       )
     ),
     yoloMode && !isBuiltinOverridden(BUILTIN_STATUSLINE_IDS.modeYolo) && import_react123.default.createElement(
@@ -655839,8 +656267,11 @@ function LoadingIndicator({ isStreaming, isStopping, isSaving, isCompressing, is
   ].join("|");
   const previousStreamActivityMarkerRef = (0, import_react126.useRef)(null);
   const lastStreamActivityElapsedSecondsRef = (0, import_react126.useRef)(elapsedSeconds);
+  const wasStreamingRef = (0, import_react126.useRef)(false);
+  const isStreamingStarted = isStreaming && !wasStreamingRef.current;
+  wasStreamingRef.current = isStreaming;
   const shouldIgnoreStreamDelay = isCompressing || isAutoCompressing;
-  if (!isStreaming || shouldIgnoreStreamDelay || previousStreamActivityMarkerRef.current !== streamActivityMarker) {
+  if (!isStreaming || shouldIgnoreStreamDelay || isStreamingStarted || previousStreamActivityMarkerRef.current !== streamActivityMarker) {
     previousStreamActivityMarkerRef.current = streamActivityMarker;
     lastStreamActivityElapsedSecondsRef.current = elapsedSeconds;
   }
@@ -663030,16 +663461,25 @@ function ToolConfirmation({ toolName, toolArguments, allTools, onConfirm, onHook
     };
   }, [terminalCommand, commandPageOffset, terminalColumns]);
   (0, import_react149.useEffect)(() => {
+    var _a21, _b14;
     const context3 = {
       toolName,
       args: toolArguments,
       isSensitive: sensitiveCommandCheck.isSensitive,
+      matchedPattern: (_a21 = sensitiveCommandCheck.matchedCommand) == null ? void 0 : _a21.pattern,
+      matchedReason: (_b14 = sensitiveCommandCheck.matchedCommand) == null ? void 0 : _b14.description,
       allTools: allTools == null ? void 0 : allTools.map((t2) => ({
         name: t2.function.name,
         arguments: t2.function.arguments
       }))
     };
     unifiedHooksExecutor.executeHooks("toolConfirmation", context3).then((hookResult) => {
+      const autoResult = extractHookProvidedConfirmation(hookResult);
+      if (autoResult) {
+        setHasSelected(true);
+        onConfirm(autoResult);
+        return;
+      }
       const interpreted = interpretHookResult("toolConfirmation", hookResult);
       if (interpreted.action === "warn" && interpreted.warningMessage) {
         console.warn(interpreted.warningMessage);
@@ -663053,7 +663493,13 @@ function ToolConfirmation({ toolName, toolArguments, allTools, onConfirm, onHook
     }).catch((error42) => {
       console.error("Failed to execute toolConfirmation hook:", error42);
     });
-  }, [toolName, toolArguments, sensitiveCommandCheck.isSensitive, allTools]);
+  }, [
+    toolName,
+    toolArguments,
+    sensitiveCommandCheck.isSensitive,
+    sensitiveCommandCheck.matchedCommand,
+    allTools
+  ]);
   (0, import_react149.useEffect)(() => {
     if (!vscodeConnection.isConnected()) {
       return;
@@ -678878,6 +679324,8 @@ var init_sseManager = __esm({
     init_hashBasedSnapshot();
     init_permissionsConfig();
     init_sensitiveCommandManager();
+    init_unifiedHooksExecutor();
+    init_hookResultInterpreter();
     SSEManager = class {
       constructor() {
         Object.defineProperty(this, "server", {
@@ -679267,6 +679715,25 @@ var init_sseManager = __esm({
             });
           }
           availableOptions.push({ value: "reject_with_reply", label: "Reject with reply" }, { value: "reject", label: "Reject and end session" });
+          try {
+            const hookContext = {
+              toolName: toolCall.function.name,
+              args: toolCall.function.arguments,
+              isSensitive,
+              matchedPattern: sensitiveInfo == null ? void 0 : sensitiveInfo.pattern,
+              matchedReason: sensitiveInfo == null ? void 0 : sensitiveInfo.description,
+              allTools: allTools == null ? void 0 : allTools.map((t) => ({
+                name: t.function.name,
+                arguments: t.function.arguments
+              }))
+            };
+            const hookResult = await unifiedHooksExecutor.executeHooks("toolConfirmation", hookContext);
+            const autoResult = extractHookProvidedConfirmation(hookResult);
+            if (autoResult) {
+              return autoResult;
+            }
+          } catch {
+          }
           sendEvent({
             type: "tool_confirmation_request",
             data: {
@@ -692854,7 +693321,7 @@ var require_package4 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "snow-ai",
-      version: "0.8.9",
+      version: "0.8.11",
       description: "Agentic coding in your terminal",
       license: "MIT",
       bin: {
@@ -693054,6 +693521,8 @@ var init_acpManager = __esm({
     init_sessionManager();
     init_permissionsConfig();
     init_sensitiveCommandManager();
+    init_unifiedHooksExecutor();
+    init_hookResultInterpreter();
     init_chat();
     init_responses();
     init_anthropic();
@@ -693479,6 +693948,26 @@ var init_acpManager = __esm({
           name: "Reject",
           kind: "reject_once"
         });
+        try {
+          const hookContext = {
+            toolName: toolCall.function.name,
+            args: toolCall.function.arguments,
+            isSensitive,
+            allTools: void 0
+          };
+          const hookResult = await unifiedHooksExecutor.executeHooks("toolConfirmation", hookContext);
+          const autoResult = extractHookProvidedConfirmation(hookResult);
+          if (autoResult) {
+            if (autoResult === "approve" || autoResult === "approve_always") {
+              if (autoResult === "approve_always") {
+                addToolToPermissions(workingDirectory, toolCall.function.name);
+              }
+              return true;
+            }
+            return false;
+          }
+        } catch {
+        }
         const toolCallUpdate = {
           toolCallId: toolCall.id,
           title: toolCall.function.name