shortcutxl 0.3.87 → 0.3.89

package/dist/app/tools/task/manager.js

@@ -345,13 +345,14 @@ function writeTaskOutput(task) {
 export function formatTaskNotification(task) {
     const durationMs = task.completedAt ? Math.max(0, task.completedAt - task.startedAt) : 0;
     const totalTokens = (task.usage?.input ?? 0) + (task.usage?.output ?? 0);
+    const costUsd = (task.usage?.cost ?? 0).toFixed(8);
     const outputPreview = truncateForParent(task.errorMessage ?? task.resultText ?? '(no output)');
     const lines = [
         `<sa status="${escapeXmlAttribute(task.status)}" type="${escapeXmlAttribute(task.subagentType)}" name="${escapeXmlAttribute(task.name || task.agentId)}" id="${escapeXmlAttribute(task.agentId)}">`,
         `  <prompt>${escapeXmlText(task.prompt)}</prompt>`,
         `  <output>${escapeXmlText(outputPreview)}</output>`,
         `  <files output="${escapeXmlAttribute(task.outputFile)}" output_chars="${task.outputFileChars ?? 0}" output_lines="${task.outputFileLines ?? 0}"${task.transcriptFile ? ` transcript="${escapeXmlAttribute(task.transcriptFile)}"` : ''}/>`,
-        `  <usage tokens="${totalTokens}" tools="${task.toolUses}" ms="${durationMs}"/>`,
+        `  <usage tokens="${totalTokens}" tools="${task.toolUses}" ms="${durationMs}" cost_usd="${costUsd}"/>`,
         '</sa>'
     ];
     return lines.join('\n');

package/dist/app/tools/task/task.d.ts

@@ -10,6 +10,7 @@
  */
 import type { ToolDefinition } from '../../../core/core-types.js';
 import { type RuntimePermissionPolicy } from '../../../core/permission-policy.js';
+import { type SubagentModelScope } from '../../../subagent-model-policy.js';
 import { type TaskModelChoice } from '../../subagents/defaults.js';
 import { type TaskManager } from './manager.js';
 import { type TaskSubagentResult } from './types.js';
@@ -48,6 +49,8 @@ interface CreateTaskToolOptions {
         readonly provider: string;
         readonly id: string;
     } | undefined;
+    /** Live model-policy scope; defaults to deriving it from the current mode. Tests inject it. */
+    getModelScope?: () => SubagentModelScope;
 }
 /** Build the child runtime tool catalog by replacing the task tool with a scoped clone. */
 export declare function buildChildRuntimeTools(tools: readonly ToolDefinition[], options: {

package/dist/app/tools/task/task.js

@@ -13,7 +13,8 @@ import { randomUUID } from 'node:crypto';
 import { StringEnum } from '../../../ai/typebox.js';
 import { RUNTIME_CAPABILITY } from '../../../core/permission-policy.js';
 import { getActiveUserMessageId } from '../../../core/user-message-id.js';
-import { getSubagentModelOverrideGuidance, getSubagentModelPolicy } from '../../../subagent-model-policy.js';
+import { getCurrentMode, MODE } from '../../../mode-names.js';
+import { getSubagentModelOverrideGuidance, getSubagentModelPolicy, SUBAGENT_MODEL_SCOPE } from '../../../subagent-model-policy.js';
 import { resolveSubagentThinkingLevel } from '../../../subagent-thinking-policy.js';
 import { MCP_TOOL_NAMES, TASK } from '../../../tool-names.js';
 import { ABORT_AGENT_MESSAGE } from '../../../utils/abort.js';
@@ -117,11 +118,16 @@ export function buildInheritedSubagentPermissionPolicy(input) {
 export function getSubagentDisplayError(result) {
     return result.errorMessage || result.text || '(subagent failed with no output)';
 }
+const SUBAGENT_THINKING_LEVELS = [
+    'low',
+    'medium',
+    'high'
+];
 /** Build the typebox schema for the task tool, optionally excluding subagent types. */
-function buildSchema(excludeSubagents, parentModelId, preferCurrentModelForSubagents, subagentModel) {
+function buildSchema(excludeSubagents, parentModelId, preferCurrentModelForSubagents, subagentModel, modelScope) {
     const allNames = getSubagentNames();
     const names = excludeSubagents ? allNames.filter((n) => !excludeSubagents.includes(n)) : allNames;
-    const modelPolicy = getSubagentModelPolicy(parentModelId);
+    const modelPolicy = getSubagentModelPolicy(parentModelId, modelScope);
     const modelChoices = preferCurrentModelForSubagents || subagentModel
         ? []
         : modelPolicy.allowedModels.map((model) => model.ref);
@@ -141,7 +147,14 @@ function buildSchema(excludeSubagents, parentModelId, preferCurrentModelForSubag
         ...(modelChoices.length > 1
             ? {
                 model: Type.Optional(StringEnum(modelChoices, {
-                    description: `Optional override. Omit to use "${modelPolicy.defaultModel.ref}". ${getSubagentModelOverrideGuidance(parentModelId)}`
+                    description: `Optional override. Omit to use "${modelPolicy.defaultModel.ref}". ${getSubagentModelOverrideGuidance(parentModelId, modelScope)}`
+                }))
+            }
+            : {}),
+        ...(modelScope === SUBAGENT_MODEL_SCOPE.SKILL_FORGE
+            ? {
+                thinking_level: Type.Optional(StringEnum(SUBAGENT_THINKING_LEVELS, {
+                    description: 'Optional reasoning-effort override for this worker. Pin one level per iteration so grades stay comparable. Luna and Pivot always run at max regardless of this value.'
                 }))
             }
             : {}),
@@ -177,15 +190,20 @@ function getMissingDeclaredTools(declaredToolNames, runtimeTools) {
 }
 /** Build the `task` tool that spawns subagents in the foreground or background. */
 export function createTaskTool(options = {}) {
-    const { cwd: cwdOverride, excludeSubagents, getRuntimeTools, notifyParent, disableMemory, preferCurrentModelForSubagents, subagentModel, parentModel, getCurrentModel, taskManager = defaultTaskManager } = options;
+    const { cwd: cwdOverride, excludeSubagents, getRuntimeTools, notifyParent, disableMemory, preferCurrentModelForSubagents, subagentModel, parentModel, getCurrentModel, getModelScope, taskManager = defaultTaskManager } = options;
     let parametersCache;
     const getActiveParentModel = () => getCurrentModel?.() ?? parentModel;
+    const getActiveModelScope = () => getModelScope?.() ??
+        (getCurrentMode() === MODE.SKILL_FORGE
+            ? SUBAGENT_MODEL_SCOPE.SKILL_FORGE
+            : SUBAGENT_MODEL_SCOPE.DEFAULT);
     const getParameters = () => {
         const activeParentModel = getActiveParentModel();
-        const key = `${activeParentModel?.id ?? ''}\0${preferCurrentModelForSubagents === true}\0${subagentModel ?? ''}`;
+        const modelScope = getActiveModelScope();
+        const key = `${activeParentModel?.id ?? ''}\0${preferCurrentModelForSubagents === true}\0${subagentModel ?? ''}\0${modelScope}`;
         if (parametersCache?.key === key)
             return parametersCache.schema;
-        const schema = buildSchema(excludeSubagents, activeParentModel?.id, preferCurrentModelForSubagents === true, subagentModel);
+        const schema = buildSchema(excludeSubagents, activeParentModel?.id, preferCurrentModelForSubagents === true, subagentModel, modelScope);
         parametersCache = { key, schema };
         return schema;
     };
@@ -197,7 +215,7 @@ export function createTaskTool(options = {}) {
             return getParameters();
         },
         async execute(toolCallId, params, signal, onUpdate, ctx) {
-            const { subagent_type, name, query: rawQuery, query_file: queryFile, model: modelOverride, run_in_background } = params;
+            const { subagent_type, name, query: rawQuery, query_file: queryFile, model: modelOverride, thinking_level: thinkingOverride, run_in_background } = params;
             const effectiveRunInBackground = run_in_background === true;
             // Look up agent config
             const agentConfig = getSubagent(subagent_type);
@@ -261,6 +279,7 @@ export function createTaskTool(options = {}) {
             const extCtx = ctx;
             const activeParentModel = extCtx.model ?? getActiveParentModel();
             const modelSelection = selectTaskModel({
+                modelScope: getActiveModelScope(),
                 parentModel: activeParentModel,
                 overrideModelRef: subagentModel ?? modelOverride,
                 preferCurrentModelForSubagents: preferCurrentModelForSubagents === true && subagentModel === undefined
@@ -281,7 +300,10 @@ export function createTaskTool(options = {}) {
                 ...agentConfig,
                 thinkingLevel: resolveSubagentThinkingLevel({
                     modelId: modelSelection.modelId,
-                    declaredLevel: agentConfig.thinkingLevel
+                    declaredLevel: agentConfig.thinkingLevel,
+                    requestedLevel: getActiveModelScope() === SUBAGENT_MODEL_SCOPE.SKILL_FORGE
+                        ? thinkingOverride
+                        : undefined
                 })
             };
             const effectiveModel = modelSelection.modelRef;