@geminixiang/mikan 1.0.2 → 1.2.0

package/dist/harness/models.js

@@ -7,6 +7,7 @@ import { googleGenerativeAIApi } from "@earendil-works/pi-ai/api/google-generati
 import { mistralConversationsApi } from "@earendil-works/pi-ai/api/mistral-conversations.lazy";
 import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
 import { openAIResponsesApi } from "@earendil-works/pi-ai/api/openai-responses.lazy";
+import { typesafeSystemOneApi } from "@earendil-works/pi-ai/api/typesafe-system-one.lazy";
 import { readJsonFileIfExists } from "../file-guards.js";
 import { errorMessage } from "../unknown-values.js";
 const CUSTOM_API_STREAMS = {
@@ -17,6 +18,9 @@ const CUSTOM_API_STREAMS = {
     "openai-completions": openAICompletionsApi,
     "openai-responses": openAIResponsesApi,
 };
+const CUSTOM_CLASSIFIER_APIS = {
+    "typesafe-system-one": typesafeSystemOneApi,
+};
 const DEFAULT_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
 const DEFAULT_CONTEXT_WINDOW = 128000;
 const DEFAULT_MAX_TOKENS = 16384;
@@ -42,14 +46,19 @@ function isModelsJsonConfig(parsed) {
             if (!Array.isArray(models)) {
                 throw new Error(`models.json provider "${name}" models must be an array`);
             }
-            const api = config.api;
-            if (typeof api !== "string" || !(api in CUSTOM_API_STREAMS)) {
-                throw new Error(`models.json provider "${name}" needs an "api" of: ${Object.keys(CUSTOM_API_STREAMS).join(", ")}`);
-            }
             for (const model of models) {
                 if (!model || typeof model !== "object" || typeof model.id !== "string") {
                     throw new Error(`models.json provider "${name}" has a model without a string "id"`);
                 }
+                if (model.type === "classifier" &&
+                    !(model.api !== undefined && model.api in CUSTOM_CLASSIFIER_APIS)) {
+                    throw new Error(`models.json provider "${name}" classifier model "${model.id}" needs an "api" of: ${Object.keys(CUSTOM_CLASSIFIER_APIS).join(", ")}`);
+                }
+            }
+            const api = config.api;
+            const hasChatModels = models.some((model) => model.type !== "classifier");
+            if (hasChatModels && (typeof api !== "string" || !(api in CUSTOM_API_STREAMS))) {
+                throw new Error(`models.json provider "${name}" needs an "api" of: ${Object.keys(CUSTOM_API_STREAMS).join(", ")}`);
             }
         }
     }
@@ -82,7 +91,21 @@ function buildCustomProvider(providerName, config) {
     const api = config.api;
     const displayName = config.name ?? providerName;
     const envVar = envVarNameFor(providerName);
-    const models = (config.models ?? []).map((modelConfig) => {
+    const configs = config.models ?? [];
+    const classifierConfigs = configs.filter((modelConfig) => modelConfig.type === "classifier");
+    const classifiers = classifierConfigs.map((modelConfig) => ({
+        type: "classifier",
+        id: modelConfig.id,
+        name: modelConfig.name ?? modelConfig.id,
+        api: modelConfig.api,
+        provider: providerName,
+        baseUrl: modelConfig.baseUrl ?? config.baseUrl ?? "",
+        input: modelConfig.input ?? ["text"],
+        cost: modelConfig.cost ?? DEFAULT_COST,
+        contextWindow: modelConfig.contextWindow ?? DEFAULT_CONTEXT_WINDOW,
+    }));
+    const chatConfigs = configs.filter((modelConfig) => modelConfig.type !== "classifier");
+    const models = chatConfigs.map((modelConfig) => {
         const model = {
             id: modelConfig.id,
             name: modelConfig.name ?? modelConfig.id,
@@ -124,8 +147,14 @@ function buildCustomProvider(providerName, config) {
                 },
             },
         },
-        models,
-        api: CUSTOM_API_STREAMS[api](),
+        models: [...models, ...classifiers],
+        api: api && chatConfigs.length > 0 ? CUSTOM_API_STREAMS[api]() : undefined,
+        classifiers: classifiers.length > 0
+            ? Object.fromEntries([...new Set(classifiers.map((model) => model.api))].map((classifierApi) => [
+                classifierApi,
+                CUSTOM_CLASSIFIER_APIS[classifierApi](),
+            ]))
+            : undefined,
     });
 }
 function overrideBuiltinProvider(provider, config) {

package/dist/harness/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/harness/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,cAAc,GAQf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAChG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,MAAM,sDAAsD,CAAC;AAC/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,mDAAmD,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,kBAAkB,GAA0C;IAChE,oBAAoB,EAAE,oBAAoB;IAC1C,wBAAwB,EAAE,uBAAuB;IACjD,sBAAsB,EAAE,qBAAqB;IAC7C,uBAAuB,EAAE,uBAAuB;IAChD,oBAAoB,EAAE,oBAAoB;IAC1C,kBAAkB,EAAE,kBAAkB;CACvC,CAAC;AAEF,MAAM,YAAY,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;AAC1E,MAAM,sBAAsB,GAAG,MAAM,CAAC;AACtC,MAAM,kBAAkB,GAAG,KAAK,CAAC;AAgCjC,MAAM,UAAU,qBAAqB,CAAC,QAAgB;IACpD,OAAO,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAe;IACzC,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,MAAM,SAAS,GAAI,MAAkC,CAAC,SAAS,CAAC;IAChE,IAAI,SAAS,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACzC,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,qBAAqB,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,MAAM,GAAI,MAA+B,CAAC,MAAM,CAAC;QACvD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,2BAA2B,CAAC,CAAC;YAC5E,CAAC;YACD,MAAM,GAAG,GAAI,MAA+B,CAAC,GAAG,CAAC;YACjD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,IAAI,kBAAkB,CAAC,EAAE,CAAC;gBAC5D,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,wBAAwB,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAClG,CAAC;YACJ,CAAC;YACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;oBACxE,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,qCAAqC,CAAC,CAAC;gBACtF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,aAAa,CAAC,YAAoB;IACzC,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC;AAChF,CAAC;AAED,SAAS,eAAe,CACtB,MAAwC,EACxC,cAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,oBAAoB,CACjC,cAAc,EACd,kBAAkB,EAClB,CAAC,MAAM,EAAE,EAAE,CAAC,2BAA2B,MAAM,EAAE,CAChD,CAAC;QACF,KAAK,MAAM,CAAC,YAAY,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;YACrF,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9D,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;YACxE,CAAC;iBAAM,IAAI,cAAc,CAAC,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;gBAC3D,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBACjD,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,CAAC,WAAW,CAAC,uBAAuB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;gBACvE,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,kBAAkB,cAAc,KAAK,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;IAClE,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,YAAoB,EAAE,MAA4B;IAC7E,MAAM,GAAG,GAAG,MAAM,CAAC,GAAI,CAAC;IACxB,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,IAAI,YAAY,CAAC;IAChD,MAAM,MAAM,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,WAAW,EAAc,EAAE;QACnE,MAAM,KAAK,GAAe;YACxB,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,EAAE;YACxC,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,CAAQ;YACpC,QAAQ,EAAE,YAAY;YACtB,OAAO,EAAE,WAAW,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE;YACpD,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,KAAK;YACzC,KAAK,EAAE,WAAW,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC;YACpC,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,YAAY;YACtC,aAAa,EAAE,WAAW,CAAC,aAAa,IAAI,sBAAsB;YAClE,SAAS,EAAE,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,eAAe,IAAI,kBAAkB;SACtF,CAAC;QACF,IAAI,WAAW,CAAC,gBAAgB;YAAE,KAAK,CAAC,gBAAgB,GAAG,WAAW,CAAC,gBAAgB,CAAC;QACxF,IAAI,WAAW,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC1C,KAAK,CAAC,OAAO,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QAChE,CAAC;QACD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC;QACnD,IAAI,MAAM;YAAE,KAAK,CAAC,MAAM,GAAG,MAA8B,CAAC;QAC1D,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;QACpB,EAAE,EAAE,YAAY;QAChB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,IAAI,EAAE,GAAG,WAAW,UAAU;gBAC9B,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE;oBACrC,MAAM,GAAG,GACP,CAAC,UAAU,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;wBAC7D,MAAM,CAAC,MAAM;wBACb,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC1B,IAAI,CAAC,GAAG;wBAAE,OAAO,SAAS,CAAC;oBAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC;oBACtD,OAAO,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC;gBAC3C,CAAC;aACF;SACF;QACD,MAAM;QACN,GAAG,EAAE,kBAAkB,CAAC,GAAG,CAAE,EAAE;KAChC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,QAAkB,EAAE,MAA4B;IAC/E,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAc,EAAE;QAC5D,MAAM,UAAU,GAAe,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACxD,IAAI,MAAM,CAAC,OAAO;YAAE,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QACxD,IAAI,MAAM,CAAC,MAAM;YAAE,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,MAA8B,CAAC;QAC7E,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,OAAO;QACL,GAAG,QAAQ;QACX,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM;KACxB,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,WAAW;IAItB,YAAoB,MAAqB,EAAE,SAA6B;QACtE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAAiC;QAC7C,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAClE,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,MAAM;QACJ,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,QAAgB,EAAE,OAAe;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,OAAe;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3C,IAAI,KAAK;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,kBAAkB,QAAQ,IAAI,OAAO,iEAAiE,CACvG,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CACjC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAChD,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACrD,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CACH,CAAC;QACF,OAAO,SAAS,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,KAAiB;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,QAAgB;QACzC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACjD,OAAO,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;CACF","sourcesContent":["import { join } from \"node:path\";\nimport {\n  createProvider,\n  type Api,\n  type AuthResult,\n  type Model,\n  type Models,\n  type MutableModels,\n  type Provider,\n  type ProviderStreams,\n} from \"@earendil-works/pi-ai\";\nimport { builtinModels } from \"@earendil-works/pi-ai/providers/all\";\nimport { anthropicMessagesApi } from \"@earendil-works/pi-ai/api/anthropic-messages.lazy\";\nimport { azureOpenAIResponsesApi } from \"@earendil-works/pi-ai/api/azure-openai-responses.lazy\";\nimport { googleGenerativeAIApi } from \"@earendil-works/pi-ai/api/google-generative-ai.lazy\";\nimport { mistralConversationsApi } from \"@earendil-works/pi-ai/api/mistral-conversations.lazy\";\nimport { openAICompletionsApi } from \"@earendil-works/pi-ai/api/openai-completions.lazy\";\nimport { openAIResponsesApi } from \"@earendil-works/pi-ai/api/openai-responses.lazy\";\nimport { readJsonFileIfExists } from \"../file-guards.js\";\nimport type { CreateMikanModelsOptions } from \"./types.js\";\nimport { errorMessage } from \"../unknown-values.js\";\n\nconst CUSTOM_API_STREAMS: Record<string, () => ProviderStreams> = {\n  \"anthropic-messages\": anthropicMessagesApi,\n  \"azure-openai-responses\": azureOpenAIResponsesApi,\n  \"google-generative-ai\": googleGenerativeAIApi,\n  \"mistral-conversations\": mistralConversationsApi,\n  \"openai-completions\": openAICompletionsApi,\n  \"openai-responses\": openAIResponsesApi,\n};\n\nconst DEFAULT_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };\nconst DEFAULT_CONTEXT_WINDOW = 128000;\nconst DEFAULT_MAX_TOKENS = 16384;\n\ninterface CustomModelConfig {\n  id: string;\n  name?: string;\n  api?: string;\n  baseUrl?: string;\n  reasoning?: boolean;\n  input?: (\"text\" | \"image\")[];\n  cost?: { input: number; output: number; cacheRead: number; cacheWrite: number };\n  contextWindow?: number;\n  maxTokens?: number;\n  maxOutputTokens?: number;\n  thinkingLevelMap?: Model<Api>[\"thinkingLevelMap\"];\n  headers?: Record<string, string>;\n  compat?: unknown;\n}\n\ninterface CustomProviderConfig {\n  name?: string;\n  api?: string;\n  baseUrl?: string;\n  apiKey?: string;\n  headers?: Record<string, string>;\n  compat?: unknown;\n  models?: CustomModelConfig[];\n}\n\ninterface ModelsJsonConfig {\n  providers?: Record<string, CustomProviderConfig>;\n}\n\nexport function defaultModelsJsonPath(stateDir: string): string {\n  return join(stateDir, \"models.json\");\n}\n\nfunction isModelsJsonConfig(parsed: unknown): parsed is ModelsJsonConfig {\n  if (!parsed || typeof parsed !== \"object\") {\n    throw new Error(\"models.json must be a JSON object\");\n  }\n  const providers = (parsed as { providers?: unknown }).providers;\n  if (providers === undefined) return true;\n  if (!providers || typeof providers !== \"object\" || Array.isArray(providers)) {\n    throw new Error('models.json \"providers\" must be an object');\n  }\n  for (const [name, config] of Object.entries(providers)) {\n    if (!config || typeof config !== \"object\") {\n      throw new Error(`models.json provider \"${name}\" must be an object`);\n    }\n    const models = (config as CustomProviderConfig).models;\n    if (models !== undefined) {\n      if (!Array.isArray(models)) {\n        throw new Error(`models.json provider \"${name}\" models must be an array`);\n      }\n      const api = (config as CustomProviderConfig).api;\n      if (typeof api !== \"string\" || !(api in CUSTOM_API_STREAMS)) {\n        throw new Error(\n          `models.json provider \"${name}\" needs an \"api\" of: ${Object.keys(CUSTOM_API_STREAMS).join(\", \")}`,\n        );\n      }\n      for (const model of models) {\n        if (!model || typeof model !== \"object\" || typeof model.id !== \"string\") {\n          throw new Error(`models.json provider \"${name}\" has a model without a string \"id\"`);\n        }\n      }\n    }\n  }\n  return true;\n}\n\nfunction envVarNameFor(providerName: string): string {\n  return `${providerName.replace(/[^a-zA-Z0-9]+/g, \"_\").toUpperCase()}_API_KEY`;\n}\n\nfunction applyModelsJson(\n  models: ReturnType<typeof builtinModels>,\n  modelsJsonPath: string,\n): string | undefined {\n  try {\n    const config = readJsonFileIfExists(\n      modelsJsonPath,\n      isModelsJsonConfig,\n      (detail) => `models.json is invalid: ${detail}`,\n    );\n    for (const [providerName, providerConfig] of Object.entries(config?.providers ?? {})) {\n      if (providerConfig.models && providerConfig.models.length > 0) {\n        models.setProvider(buildCustomProvider(providerName, providerConfig));\n      } else if (providerConfig.baseUrl || providerConfig.compat) {\n        const builtin = models.getProvider(providerName);\n        if (builtin) {\n          models.setProvider(overrideBuiltinProvider(builtin, providerConfig));\n        }\n      }\n    }\n    return undefined;\n  } catch (err) {\n    return `Failed to load ${modelsJsonPath}: ${errorMessage(err)}`;\n  }\n}\n\nfunction buildCustomProvider(providerName: string, config: CustomProviderConfig): Provider {\n  const api = config.api!;\n  const displayName = config.name ?? providerName;\n  const envVar = envVarNameFor(providerName);\n  const models = (config.models ?? []).map((modelConfig): Model<Api> => {\n    const model: Model<Api> = {\n      id: modelConfig.id,\n      name: modelConfig.name ?? modelConfig.id,\n      api: (modelConfig.api ?? api) as Api,\n      provider: providerName,\n      baseUrl: modelConfig.baseUrl ?? config.baseUrl ?? \"\",\n      reasoning: modelConfig.reasoning ?? false,\n      input: modelConfig.input ?? [\"text\"],\n      cost: modelConfig.cost ?? DEFAULT_COST,\n      contextWindow: modelConfig.contextWindow ?? DEFAULT_CONTEXT_WINDOW,\n      maxTokens: modelConfig.maxTokens ?? modelConfig.maxOutputTokens ?? DEFAULT_MAX_TOKENS,\n    };\n    if (modelConfig.thinkingLevelMap) model.thinkingLevelMap = modelConfig.thinkingLevelMap;\n    if (modelConfig.headers ?? config.headers) {\n      model.headers = { ...config.headers, ...modelConfig.headers };\n    }\n    const compat = modelConfig.compat ?? config.compat;\n    if (compat) model.compat = compat as Model<Api>[\"compat\"];\n    return model;\n  });\n\n  return createProvider({\n    id: providerName,\n    name: displayName,\n    baseUrl: config.baseUrl,\n    headers: config.headers,\n    auth: {\n      apiKey: {\n        name: `${displayName} API key`,\n        resolve: async ({ ctx, credential }) => {\n          const key =\n            (credential?.type === \"api_key\" ? credential.key : undefined) ??\n            config.apiKey ??\n            (await ctx.env(envVar));\n          if (!key) return undefined;\n          const source = config.apiKey ? \"models.json\" : envVar;\n          return { auth: { apiKey: key }, source };\n        },\n      },\n    },\n    models,\n    api: CUSTOM_API_STREAMS[api]!(),\n  });\n}\n\nfunction overrideBuiltinProvider(provider: Provider, config: CustomProviderConfig): Provider {\n  const models = provider.getModels().map((model): Model<Api> => {\n    const overridden: Model<Api> = Object.assign({}, model);\n    if (config.baseUrl) overridden.baseUrl = config.baseUrl;\n    if (config.compat) overridden.compat = config.compat as Model<Api>[\"compat\"];\n    return overridden;\n  });\n  return {\n    ...provider,\n    getModels: () => models,\n  };\n}\n\nexport class MikanModels {\n  readonly models: Models;\n  private loadError: string | undefined;\n\n  private constructor(models: MutableModels, loadError: string | undefined) {\n    this.models = models;\n    this.loadError = loadError;\n  }\n\n  static create(options: CreateMikanModelsOptions): MikanModels {\n    const models = builtinModels();\n    const loadError = applyModelsJson(models, options.modelsJsonPath);\n    return new MikanModels(models, loadError);\n  }\n\n  getError(): string | undefined {\n    return this.loadError;\n  }\n\n  getAll(): Model<Api>[] {\n    return [...this.models.getModels()];\n  }\n\n  find(provider: string, modelId: string): Model<Api> | undefined {\n    return this.models.getModel(provider, modelId);\n  }\n\n  resolve(provider: string, modelId: string): Model<Api> {\n    const model = this.find(provider, modelId);\n    if (model) return model;\n    throw new Error(\n      `Unknown model \"${provider}/${modelId}\". Configure it in pi models.json or choose a registered model.`,\n    );\n  }\n\n  async getAvailable(): Promise<Model<Api>[]> {\n    const available = await Promise.all(\n      this.models.getProviders().map(async (provider) => {\n        try {\n          return await this.models.getAvailable(provider.id);\n        } catch {\n          return [];\n        }\n      }),\n    );\n    return available.flat();\n  }\n\n  getAuth(model: Model<Api>): Promise<AuthResult | undefined> {\n    return this.models.getAuth(model);\n  }\n\n  async getApiKeyForProvider(provider: string): Promise<string | undefined> {\n    try {\n      const auth = await this.models.getAuth(provider);\n      return auth?.auth.apiKey;\n    } catch {\n      return undefined;\n    }\n  }\n}\n"]}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/harness/models.ts"],"names":[],"mappings":"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","sourcesContent":["import { join } from \"node:path\";\nimport {\n  createProvider,\n  type Api,\n  type AuthResult,\n  type ClassifierApi,\n  type ClassifierModel,\n  type Model,\n  type Models,\n  type MutableModels,\n  type Provider,\n  type ProviderClassifier,\n  type ProviderStreams,\n} from \"@earendil-works/pi-ai\";\nimport { builtinModels } from \"@earendil-works/pi-ai/providers/all\";\nimport { anthropicMessagesApi } from \"@earendil-works/pi-ai/api/anthropic-messages.lazy\";\nimport { azureOpenAIResponsesApi } from \"@earendil-works/pi-ai/api/azure-openai-responses.lazy\";\nimport { googleGenerativeAIApi } from \"@earendil-works/pi-ai/api/google-generative-ai.lazy\";\nimport { mistralConversationsApi } from \"@earendil-works/pi-ai/api/mistral-conversations.lazy\";\nimport { openAICompletionsApi } from \"@earendil-works/pi-ai/api/openai-completions.lazy\";\nimport { openAIResponsesApi } from \"@earendil-works/pi-ai/api/openai-responses.lazy\";\nimport { typesafeSystemOneApi } from \"@earendil-works/pi-ai/api/typesafe-system-one.lazy\";\nimport { readJsonFileIfExists } from \"../file-guards.js\";\nimport type { CreateMikanModelsOptions } from \"./types.js\";\nimport { errorMessage } from \"../unknown-values.js\";\n\nconst CUSTOM_API_STREAMS: Record<string, () => ProviderStreams> = {\n  \"anthropic-messages\": anthropicMessagesApi,\n  \"azure-openai-responses\": azureOpenAIResponsesApi,\n  \"google-generative-ai\": googleGenerativeAIApi,\n  \"mistral-conversations\": mistralConversationsApi,\n  \"openai-completions\": openAICompletionsApi,\n  \"openai-responses\": openAIResponsesApi,\n};\n\nconst CUSTOM_CLASSIFIER_APIS: Record<string, () => ProviderClassifier> = {\n  \"typesafe-system-one\": typesafeSystemOneApi,\n};\n\nconst DEFAULT_COST = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };\nconst DEFAULT_CONTEXT_WINDOW = 128000;\nconst DEFAULT_MAX_TOKENS = 16384;\n\ninterface CustomModelConfig {\n  id: string;\n  type?: \"classifier\";\n  name?: string;\n  api?: string;\n  baseUrl?: string;\n  reasoning?: boolean;\n  input?: (\"text\" | \"image\")[];\n  cost?: { input: number; output: number; cacheRead: number; cacheWrite: number };\n  contextWindow?: number;\n  maxTokens?: number;\n  maxOutputTokens?: number;\n  thinkingLevelMap?: Model<Api>[\"thinkingLevelMap\"];\n  headers?: Record<string, string>;\n  compat?: unknown;\n}\n\ninterface CustomProviderConfig {\n  name?: string;\n  api?: string;\n  baseUrl?: string;\n  apiKey?: string;\n  headers?: Record<string, string>;\n  compat?: unknown;\n  models?: CustomModelConfig[];\n}\n\ninterface ModelsJsonConfig {\n  providers?: Record<string, CustomProviderConfig>;\n}\n\nexport function defaultModelsJsonPath(stateDir: string): string {\n  return join(stateDir, \"models.json\");\n}\n\nfunction isModelsJsonConfig(parsed: unknown): parsed is ModelsJsonConfig {\n  if (!parsed || typeof parsed !== \"object\") {\n    throw new Error(\"models.json must be a JSON object\");\n  }\n  const providers = (parsed as { providers?: unknown }).providers;\n  if (providers === undefined) return true;\n  if (!providers || typeof providers !== \"object\" || Array.isArray(providers)) {\n    throw new Error('models.json \"providers\" must be an object');\n  }\n  for (const [name, config] of Object.entries(providers)) {\n    if (!config || typeof config !== \"object\") {\n      throw new Error(`models.json provider \"${name}\" must be an object`);\n    }\n    const models = (config as CustomProviderConfig).models;\n    if (models !== undefined) {\n      if (!Array.isArray(models)) {\n        throw new Error(`models.json provider \"${name}\" models must be an array`);\n      }\n      for (const model of models) {\n        if (!model || typeof model !== \"object\" || typeof model.id !== \"string\") {\n          throw new Error(`models.json provider \"${name}\" has a model without a string \"id\"`);\n        }\n        if (\n          model.type === \"classifier\" &&\n          !(model.api !== undefined && model.api in CUSTOM_CLASSIFIER_APIS)\n        ) {\n          throw new Error(\n            `models.json provider \"${name}\" classifier model \"${model.id}\" needs an \"api\" of: ${Object.keys(CUSTOM_CLASSIFIER_APIS).join(\", \")}`,\n          );\n        }\n      }\n      const api = (config as CustomProviderConfig).api;\n      const hasChatModels = models.some((model) => model.type !== \"classifier\");\n      if (hasChatModels && (typeof api !== \"string\" || !(api in CUSTOM_API_STREAMS))) {\n        throw new Error(\n          `models.json provider \"${name}\" needs an \"api\" of: ${Object.keys(CUSTOM_API_STREAMS).join(\", \")}`,\n        );\n      }\n    }\n  }\n  return true;\n}\n\nfunction envVarNameFor(providerName: string): string {\n  return `${providerName.replace(/[^a-zA-Z0-9]+/g, \"_\").toUpperCase()}_API_KEY`;\n}\n\nfunction applyModelsJson(\n  models: ReturnType<typeof builtinModels>,\n  modelsJsonPath: string,\n): string | undefined {\n  try {\n    const config = readJsonFileIfExists(\n      modelsJsonPath,\n      isModelsJsonConfig,\n      (detail) => `models.json is invalid: ${detail}`,\n    );\n    for (const [providerName, providerConfig] of Object.entries(config?.providers ?? {})) {\n      if (providerConfig.models && providerConfig.models.length > 0) {\n        models.setProvider(buildCustomProvider(providerName, providerConfig));\n      } else if (providerConfig.baseUrl || providerConfig.compat) {\n        const builtin = models.getProvider(providerName);\n        if (builtin) {\n          models.setProvider(overrideBuiltinProvider(builtin, providerConfig));\n        }\n      }\n    }\n    return undefined;\n  } catch (err) {\n    return `Failed to load ${modelsJsonPath}: ${errorMessage(err)}`;\n  }\n}\n\nfunction buildCustomProvider(providerName: string, config: CustomProviderConfig): Provider {\n  const api = config.api;\n  const displayName = config.name ?? providerName;\n  const envVar = envVarNameFor(providerName);\n  const configs = config.models ?? [];\n  const classifierConfigs = configs.filter((modelConfig) => modelConfig.type === \"classifier\");\n  const classifiers = classifierConfigs.map(\n    (modelConfig): ClassifierModel<ClassifierApi> => ({\n      type: \"classifier\",\n      id: modelConfig.id,\n      name: modelConfig.name ?? modelConfig.id,\n      api: modelConfig.api!,\n      provider: providerName,\n      baseUrl: modelConfig.baseUrl ?? config.baseUrl ?? \"\",\n      input: modelConfig.input ?? [\"text\"],\n      cost: modelConfig.cost ?? DEFAULT_COST,\n      contextWindow: modelConfig.contextWindow ?? DEFAULT_CONTEXT_WINDOW,\n    }),\n  );\n  const chatConfigs = configs.filter((modelConfig) => modelConfig.type !== \"classifier\");\n  const models = chatConfigs.map((modelConfig): Model<Api> => {\n    const model: Model<Api> = {\n      id: modelConfig.id,\n      name: modelConfig.name ?? modelConfig.id,\n      api: (modelConfig.api ?? api!) as Api,\n      provider: providerName,\n      baseUrl: modelConfig.baseUrl ?? config.baseUrl ?? \"\",\n      reasoning: modelConfig.reasoning ?? false,\n      input: modelConfig.input ?? [\"text\"],\n      cost: modelConfig.cost ?? DEFAULT_COST,\n      contextWindow: modelConfig.contextWindow ?? DEFAULT_CONTEXT_WINDOW,\n      maxTokens: modelConfig.maxTokens ?? modelConfig.maxOutputTokens ?? DEFAULT_MAX_TOKENS,\n    };\n    if (modelConfig.thinkingLevelMap) model.thinkingLevelMap = modelConfig.thinkingLevelMap;\n    if (modelConfig.headers ?? config.headers) {\n      model.headers = { ...config.headers, ...modelConfig.headers };\n    }\n    const compat = modelConfig.compat ?? config.compat;\n    if (compat) model.compat = compat as Model<Api>[\"compat\"];\n    return model;\n  });\n\n  return createProvider({\n    id: providerName,\n    name: displayName,\n    baseUrl: config.baseUrl,\n    headers: config.headers,\n    auth: {\n      apiKey: {\n        name: `${displayName} API key`,\n        resolve: async ({ ctx, credential }) => {\n          const key =\n            (credential?.type === \"api_key\" ? credential.key : undefined) ??\n            config.apiKey ??\n            (await ctx.env(envVar));\n          if (!key) return undefined;\n          const source = config.apiKey ? \"models.json\" : envVar;\n          return { auth: { apiKey: key }, source };\n        },\n      },\n    },\n    models: [...models, ...classifiers],\n    api: api && chatConfigs.length > 0 ? CUSTOM_API_STREAMS[api]!() : undefined,\n    classifiers:\n      classifiers.length > 0\n        ? Object.fromEntries(\n            [...new Set(classifiers.map((model) => model.api))].map((classifierApi) => [\n              classifierApi,\n              CUSTOM_CLASSIFIER_APIS[classifierApi]!(),\n            ]),\n          )\n        : undefined,\n  });\n}\n\nfunction overrideBuiltinProvider(provider: Provider, config: CustomProviderConfig): Provider {\n  const models = provider.getModels().map((model): Model<Api> => {\n    const overridden: Model<Api> = Object.assign({}, model);\n    if (config.baseUrl) overridden.baseUrl = config.baseUrl;\n    if (config.compat) overridden.compat = config.compat as Model<Api>[\"compat\"];\n    return overridden;\n  });\n  return {\n    ...provider,\n    getModels: () => models,\n  };\n}\n\nexport class MikanModels {\n  readonly models: Models;\n  private loadError: string | undefined;\n\n  private constructor(models: MutableModels, loadError: string | undefined) {\n    this.models = models;\n    this.loadError = loadError;\n  }\n\n  static create(options: CreateMikanModelsOptions): MikanModels {\n    const models = builtinModels();\n    const loadError = applyModelsJson(models, options.modelsJsonPath);\n    return new MikanModels(models, loadError);\n  }\n\n  getError(): string | undefined {\n    return this.loadError;\n  }\n\n  getAll(): Model<Api>[] {\n    return [...this.models.getModels()];\n  }\n\n  find(provider: string, modelId: string): Model<Api> | undefined {\n    return this.models.getModel(provider, modelId);\n  }\n\n  resolve(provider: string, modelId: string): Model<Api> {\n    const model = this.find(provider, modelId);\n    if (model) return model;\n    throw new Error(\n      `Unknown model \"${provider}/${modelId}\". Configure it in pi models.json or choose a registered model.`,\n    );\n  }\n\n  async getAvailable(): Promise<Model<Api>[]> {\n    const available = await Promise.all(\n      this.models.getProviders().map(async (provider) => {\n        try {\n          return await this.models.getAvailable(provider.id);\n        } catch {\n          return [];\n        }\n      }),\n    );\n    return available.flat();\n  }\n\n  getAuth(model: Model<Api>): Promise<AuthResult | undefined> {\n    return this.models.getAuth(model);\n  }\n\n  async getApiKeyForProvider(provider: string): Promise<string | undefined> {\n    try {\n      const auth = await this.models.getAuth(provider);\n      return auth?.auth.apiKey;\n    } catch {\n      return undefined;\n    }\n  }\n}\n"]}

package/dist/harness/presenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presenter.d.ts","sourceRoot":"","sources":["../../src/harness/presenter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,0BAA0B,EAG1B,eAAe,EACf,sBAAsB,EAEtB,kBAAkB,EAClB,yBAAyB,EAEzB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMtD,OAAO,KAAK,EAAE,qBAAqB,EAA4B,MAAM,aAAa,CAAC;AAiGnF,wBAAgB,cAAc,IAAI,kBAAkB,CAEnD;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,sBAAsB,GAC9B,eAAe,CA6CjB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAGxE;AAED,wBAAgB,yBAAyB,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEzF;AAwID,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,qBAAqB,EAChC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC,CAsBf;AA4ED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyF/E;AA0fD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,yBAAyB,GAAG,IAAI,CAyBlF"}
+{"version":3,"file":"presenter.d.ts","sourceRoot":"","sources":["../../src/harness/presenter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,0BAA0B,EAG1B,eAAe,EACf,sBAAsB,EAEtB,kBAAkB,EAClB,yBAAyB,EAEzB,kBAAkB,EACnB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMtD,OAAO,KAAK,EACV,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AAmGrB,wBAAgB,cAAc,IAAI,kBAAkB,CAEnD;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,sBAAsB,GAC9B,eAAe,CA6CjB;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAGxE;AAED,wBAAgB,yBAAyB,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAEzF;AAwID,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,qBAAqB,EAChC,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC,CAkBf;AAiED,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwF/E;AAmfD,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,yBAAyB,GAAG,IAAI,CAyBlF"}

package/dist/harness/presenter.js

@@ -47,6 +47,8 @@ function createRunStateDefaults() {
         subagentProgressShown: false,
         suppressResponseDeltas: false,
         answerStreamStarted: false,
+        answerText: "",
+        notice: "",
         workAcknowledged: false,
         publishRunEvent: undefined,
         lastSubagentProgressAt: 0,
@@ -145,7 +147,7 @@ function formatResponseWithToolProgress(text, runState) {
 }
 async function replaceWithSubagentDashboard(responder, snapshot, finalText, options) {
     if (responder.replaceSubagentProgress) {
-        await responder.replaceSubagentProgress(snapshot, finalText);
+        await responder.replaceSubagentProgress(snapshot, finalText, options);
         return;
     }
     const dashboard = renderSubagentDashboard(snapshot);
@@ -156,9 +158,9 @@ async function replaceResponseWithToolProgress(responder, runState, subagentProg
         await replaceWithSubagentDashboard(responder, subagentProgress);
         return;
     }
-    const progress = formatToolProgress(runState);
-    if (progress)
-        await responder.replaceResponse(progress);
+    const view = formatResponseWithToolProgress(runState.answerText || runState.notice, runState);
+    if (view)
+        await responder.replaceResponse(view);
 }
 const TOOL_PROGRESS_DEBOUNCE_MS = 500;
 const SUBAGENT_PROGRESS_THROTTLE_MS = 2000;
@@ -215,7 +217,7 @@ async function finalizeErrorResponse(responder, runState, options) {
         });
     }
     try {
-        await responder.replaceResponse("_Sorry, something went wrong_");
+        await responder.replaceResponse("_Sorry, something went wrong_", { final: true });
         await responder.respondDiagnostic(`Error: ${runState.errorMessage}`, { style: "error" });
     }
     catch (err) {
@@ -245,10 +247,6 @@ export async function finalizeRunResponse(responder, session, runState, options)
         log.logInfo("Final response already handled by tool - skipping final replacement");
         return;
     }
-    if (isSilentResponse(finalText)) {
-        await deleteForSilentResponse(responder);
-        return;
-    }
     if (!finalText.trim())
         return;
     const published = await publishFinalResponse(responder, runState, finalText, options);
@@ -256,19 +254,6 @@ export async function finalizeRunResponse(responder, session, runState, options)
     if (published && runState.stopReason === "stop" && (didWork || options?.initialTask))
         await responder.notifyCompletion?.();
 }
-function isSilentResponse(finalText) {
-    return finalText.trim().startsWith("[SILENT]");
-}
-async function deleteForSilentResponse(responder) {
-    try {
-        await responder.deleteResponse();
-        log.logInfo("Silent response - deleted message and thread");
-    }
-    catch (err) {
-        const errMsg = errorMessage(err);
-        log.logWarning("Failed to delete message for silent response", errMsg);
-    }
-}
 function resolveSingleCompletedProfile(runState) {
     const nodes = runState.completedSubagentProgress.flatMap((snapshot) => snapshot.nodes);
     if (nodes.length === 0)
@@ -290,17 +275,20 @@ async function publishFinalResponse(responder, runState, finalText, options) {
             if (resolvedProfile && responder.respondAsRole) {
                 await replaceWithSubagentDashboard(responder, finalDashboard, undefined, {
                     createOverflowLink: options?.createOverflowLink,
+                    final: true,
                 });
                 await responder.respondAsRole(resolvedProfile, finalResponse);
                 return true;
             }
             await replaceWithSubagentDashboard(responder, finalDashboard, finalResponse, {
                 createOverflowLink: options?.createOverflowLink,
+                final: true,
             });
             return true;
         }
         await responder.replaceResponse(formatResponseWithToolProgress(finalResponse, runState), {
             createOverflowLink: options?.createOverflowLink,
+            final: true,
         });
         return true;
     }
@@ -389,8 +377,7 @@ export async function reportUsageSummary(ctx) {
     const statusOnly = toolNames.length > 0 && toolNames.every((name) => name === TASK_STATUS_TOOL);
     if (platform.diagnostics?.showUsageSummary === true &&
         !runState.finalResponseHandledByTool &&
-        !statusOnly &&
-        !isSilentResponse(getFinalAssistantText(session))) {
+        !statusOnly) {
         runState.queue.enqueue(() => responder.respondDiagnostic(summary, { style: "muted" }), "usage summary");
         await waitForQueue();
     }
@@ -735,35 +722,22 @@ function presentToolEnded(event, context) {
     runState.subagentProgress.delete(event.toolCallId);
 }
 function presentAssistantDelta(event, context) {
-    const { runState } = context;
-    if (!context.responder.appendResponseDelta || runState.suppressResponseDeltas)
+    const { runState, responder } = context;
+    if (!responder.showsPartialAnswer || runState.suppressResponseDeltas)
         return;
-    const delta = runState.answerStreamStarted
-        ? event.delta
-        : formatResponseWithToolProgress(event.delta, runState);
+    runState.answerText = runState.answerStreamStarted
+        ? runState.answerText + event.delta
+        : event.delta;
     runState.answerStreamStarted = true;
-    context.queue.enqueue(async () => {
-        await context.responder.appendResponseDelta?.(delta);
-    }, "response delta");
+    runState.notice = "";
+    context.queue.enqueue(() => replaceResponseWithToolProgress(responder, runState), "response delta");
 }
 function presentThinking(thinking, context) {
     log.logThinking(context.logCtx, thinking);
-    context.queue.enqueue(() => context.responder.respond(`_${thinking}_`), "thinking main");
     context.queue.enqueue(() => context.responder.respondDiagnostic(`_${thinking}_`), "thinking diagnostic");
 }
 function presentFinalText(text, context) {
-    const finalText = appendTriggerAttribution(formatResponseWithToolProgress(text, context.runState), context.runState.triggerAttribution);
     log.logResponse(context.logCtx, text);
-    if (context.runState.completedSubagentProgress.length > 0)
-        return;
-    if (context.responder.finishResponse) {
-        context.queue.enqueue(async () => {
-            await context.responder.finishResponse?.(finalText);
-        }, "response finish");
-    }
-    else {
-        context.queue.enqueue(() => context.responder.respond(finalText), "response main");
-    }
 }
 function presentAssistantMessage(event, context) {
     for (const thinking of event.thinking)
@@ -790,11 +764,12 @@ function presentRunEvent(event, context) {
             presentAssistantMessage(event, context);
             return;
         case "compaction_started":
-            context.queue.enqueue(() => context.responder.respond("_Compacting context..._"), "compaction start");
+            context.runState.notice = "_Compacting context..._";
+            context.queue.enqueue(() => replaceResponseWithToolProgress(context.responder, context.runState), "compaction start");
             return;
         case "retry_started": {
-            const text = `_Retrying (${event.attempt}/${event.maxAttempts})..._`;
-            context.queue.enqueue(() => context.responder.respond(text), "retry");
+            context.runState.notice = `_Retrying (${event.attempt}/${event.maxAttempts})..._`;
+            context.queue.enqueue(() => replaceResponseWithToolProgress(context.responder, context.runState), "retry");
             return;
         }
         case "budget_exceeded": {