@usabledev/usable-chat 1.207.3 → 1.207.5

package/cli.js

@@ -362969,18 +362969,35 @@ function shouldRecoverSilentStop({
   recoveryAttempted,
   recoverPreToolStop = false
 }) {
-  return !recoveryAttempted && !text5?.trim() && (lastStepHadToolErrors || lastStepHadToolActivity || recoverPreToolStop);
+  const stoppedBeforeAction = !text5?.trim() || recoverPreToolStop && isIncompleteWorkActionPreamble(text5);
+  return !recoveryAttempted && stoppedBeforeAction && (lastStepHadToolErrors || lastStepHadToolActivity || recoverPreToolStop);
+}
+function isIncompleteWorkActionPreamble(text5) {
+  const value = text5?.trim();
+  if (!value || value.length > 160 || /[\n:;—–]|```/.test(value)) return false;
+  const withoutLeadIn = value.replace(/^sure[,!.]?\s*/i, "");
+  const withoutTerminalPunctuation = withoutLeadIn.replace(/[.!?]$/, "");
+  if (/[,.!?]/.test(withoutTerminalPunctuation)) return false;
+  if (!/(?:\bfor you|\bnow|\bnext|\bright away|\bshortly|\bmomentarily|\bfirst)[.!?]?$/i.test(value)) {
+    return false;
+  }
+  return /^(?:sure[,!.]?\s*)?(?:i(?:'ll|\s+will|\s+am going to)|let me)\s+(?:now\s+)?(?:retrieve|fetch|look up|check|find|list|gather|inspect|run|execute|search|load|open|read|create|update|write|analy[sz]e)\b/i.test(
+    value
+  );
 }
 function resolveSilentStopResponse({
   text: text5,
   recoveryAttempted,
   recoverPreToolStop
 }) {
-  if (recoverPreToolStop && recoveryAttempted && !text5?.trim()) {
+  if (recoverPreToolStop && recoveryAttempted && (!text5?.trim() || isIncompleteWorkActionPreamble(text5))) {
     return "I could not complete that Work request. Please try again.";
   }
   return text5 || "";
 }
+function resolveWorkForcedToolName(input) {
+  return input.isWorkMode && !input.alreadySatisfied && typeof input.requestedToolName === "string" && input.offeredToolNames.includes(input.requestedToolName) ? input.requestedToolName : void 0;
+}
 function shouldInjectVisualizationPrompt(config3) {
   return !config3.localFilesystem && config3.visualizationsEnabled !== false;
 }
@@ -363746,7 +363763,8 @@ async function callLLM({
   scriptedLlm,
   providerRouting,
   providerPrivacy,
-  providerAttemptBudget
+  providerAttemptBudget,
+  forcedToolName
 }) {
   if (process.env.E2E_ALLOW_TEST_SEAMS === "true" && scriptedLlm && scriptedLlm.length > 0) {
     const turn = selectScriptedTurn(scriptedLlm, conversationMessages);
@@ -363975,7 +363993,7 @@ async function callLLM({
                 include_usage: true
               },
               tools,
-              tool_choice: shouldEnableTools ? "auto" : void 0,
+              tool_choice: shouldEnableTools ? forcedToolName ? { type: "function", function: { name: forcedToolName } } : "auto" : void 0,
               temperature,
               max_tokens: maxTokens,
               // Only OpenRouter accepts this extension. Compatible routes
@@ -366648,7 +366666,9 @@ ${combinedSystemMessage}` : combinedSystemMessage;
       );
       if (receipt) {
         if (receipt.outcome === "unknown")
-          throw new Error("Earlier tool outcome is unknown; repeating this action requires user resolution.");
+          throw new Error(
+            "Earlier tool outcome is unknown; repeating this action requires user resolution."
+          );
         return receipt.result;
       }
     }
@@ -366848,6 +366868,7 @@ ${combinedSystemMessage}` : combinedSystemMessage;
   let lastStepHadToolActivity = false;
   let recoveryAttempted = false;
   let hookContinuationAttempted = false;
+  let requiredWorkToolSatisfied = false;
   const repeatedToolCallCounts = /* @__PURE__ */ new Map();
   const MAX_IDENTICAL_TOOL_CALLS = 3;
   const stableStringify = (value) => {
@@ -366960,13 +366981,21 @@ ${submitHooks.context.join("\n")}
         );
         const useOpenAIToolFormat = !isClaude || providerRouting?.provider === "usable";
         const tools = shouldEnableTools && rawTools && !forceNoTools ? useOpenAIToolFormat ? adaptToolSchemasForProvider(convertToOpenRouterTools(rawTools), selectedModelId) : convertToClaudeTools(rawTools) : void 0;
+        const toolNames2 = tools ? !useOpenAIToolFormat ? tools.map((tool2) => tool2.name) : tools.map((tool2) => tool2.function.name) : [];
+        const requestedWorkToolName = context3.metadata?.workRequiredToolName;
+        const forcedToolName = resolveWorkForcedToolName({
+          isWorkMode: context3.metadata?.workRuntime === "machine",
+          requestedToolName: requestedWorkToolName,
+          offeredToolNames: toolNames2,
+          alreadySatisfied: requiredWorkToolSatisfied
+        });
         if (tools) {
-          const toolNames2 = !useOpenAIToolFormat ? tools.map((t14) => t14.name) : tools.map((t14) => t14.function.name);
           orchestrationLogger.info("Tools being sent to provider", {
             provider: isClaude ? "claude" : "openrouter",
             toolCount: toolNames2.length,
             toolNames: toolNames2,
-            hasAskSubagent: toolNames2.includes("ask-subagent")
+            hasAskSubagent: toolNames2.includes("ask-subagent"),
+            forcedToolName
           });
         }
         const toCountableMessage = (msg) => {
@@ -367345,7 +367374,8 @@ Re-read them (working_memory on web, bash on the CLI \u2014 grep/sed projection,
                 scriptedLlm: config3.__scriptedLlm,
                 providerRouting,
                 providerPrivacy,
-                providerAttemptBudget
+                providerAttemptBudget,
+                forcedToolName
               });
               const overflowResult = result;
               if (overflowResult.finishReason === "error" && (overflowResult.contextOverflow || isContextOverflowError(overflowResult.errorMessage))) {
@@ -367439,6 +367469,9 @@ Re-read them (working_memory on web, bash on the CLI \u2014 grep/sed projection,
           finishReason: result.finishReason,
           toolCallsCount: result.toolCalls.length
         });
+        if (forcedToolName && result.toolCalls.some((toolCall) => toolCall.name === forcedToolName)) {
+          requiredWorkToolSatisfied = true;
+        }
         orchestrationLogger.info(
           `Step ${currentStep} complete`,
           {
@@ -367470,7 +367503,7 @@ Re-read them (working_memory on web, bash on the CLI \u2014 grep/sed projection,
             recoverPreToolStop: context3.metadata?.workRuntime === "machine"
           })) {
             recoveryAttempted = true;
-            const recoveryPrompt = lastStepHadToolErrors ? "The previous tool call failed. Briefly summarise to the user what happened, why it likely failed, and any next steps they could take (without retrying the failed tool)." : lastStepHadToolActivity ? "The previous step used tools but did not produce a visible final answer. Using the available tool results, answer the user now. Do not call more tools unless absolutely required." : "The previous response ended before producing visible content or a tool call. Complete the user's original request now. Use the available tools when the request requires them.";
+            const recoveryPrompt = lastStepHadToolErrors ? "The previous tool call failed. Briefly summarise to the user what happened, why it likely failed, and any next steps they could take (without retrying the failed tool)." : lastStepHadToolActivity ? "The previous step used tools but did not produce a visible final answer. Using the available tool results, answer the user now. Do not call more tools unless absolutely required." : "The previous response stopped before completing the requested action. Do not merely announce what you will do. Complete the user's original request now and call the required tool when one is available.";
             orchestrationLogger.warn(
               "Model stopped silently \u2014 injecting recovery prompt",
               {
@@ -391558,7 +391591,7 @@ init_tui_select();
 init_model_registry();
 
 // package.json
-var version2 = "1.207.3";
+var version2 = "1.207.5";
 
 // src/adapters/cli/model-catalog.ts
 init_codex_auth();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usabledev/usable-chat",
-  "version": "1.207.3",
+  "version": "1.207.5",
   "description": "usable-chat — terminal harness for usable-chat (headless + TUI)",
   "type": "module",
   "bin": {