@tyvm/knowhow 0.0.137 → 0.0.140

package/ts_build/tests/agents/tools/sendAgentMessage.test.js

@@ -0,0 +1,112 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const sendAgentMessage_1 = require("../../../src/agents/tools/sendAgentMessage");
+describe("sendAgentMessage", () => {
+    let tmpCwd;
+    let originalCwd;
+    let agentsDir;
+    beforeEach(() => {
+        originalCwd = process.cwd();
+        tmpCwd = fs.mkdtempSync(path.join(os.tmpdir(), "send-msg-"));
+        process.chdir(tmpCwd);
+        agentsDir = path.join(tmpCwd, ".knowhow", "processes", "agents");
+        fs.mkdirSync(agentsDir, { recursive: true });
+    });
+    afterEach(() => {
+        process.chdir(originalCwd);
+        fs.rmSync(tmpCwd, { recursive: true, force: true });
+    });
+    function makeTask(taskId) {
+        const dir = path.join(agentsDir, taskId);
+        fs.mkdirSync(dir, { recursive: true });
+        return dir;
+    }
+    it("requires taskId and message", async () => {
+        expect(await (0, sendAgentMessage_1.sendAgentMessage)({ taskId: "", message: "hi" })).toMatch(/taskId is required/);
+        expect(await (0, sendAgentMessage_1.sendAgentMessage)({ taskId: "x", message: "" })).toMatch(/message is required/);
+    });
+    it("errors when the target task dir doesn't exist", async () => {
+        const res = await (0, sendAgentMessage_1.sendAgentMessage)({ taskId: "nope", message: "hi" });
+        expect(res).toMatch(/target task directory not found/);
+    });
+    it("appends an envelope with sender identity from _ctx", async () => {
+        makeTask("child-1");
+        const res = await (0, sendAgentMessage_1.sendAgentMessage)({
+            taskId: "child-1",
+            message: "do the thing",
+            _ctx: { taskId: "parent-1", caller: { name: "Developer" } },
+        });
+        expect(res).toMatch(/Sent message to task child-1/);
+        const input = fs.readFileSync(path.join(agentsDir, "child-1", "input.txt"), "utf8");
+        expect(input).toContain("[from:parent-1/Developer] do the thing");
+    });
+    it("uses explicit from when provided", async () => {
+        makeTask("child-2");
+        await (0, sendAgentMessage_1.sendAgentMessage)({
+            taskId: "child-2",
+            message: "msg",
+            from: "orchestrator",
+        });
+        const input = fs.readFileSync(path.join(agentsDir, "child-2", "input.txt"), "utf8");
+        expect(input).toContain("[from:orchestrator] msg");
+    });
+    it("delivers as /poke when poke:true (interrupts recipient)", async () => {
+        makeTask("child-3");
+        await (0, sendAgentMessage_1.sendAgentMessage)({
+            taskId: "child-3",
+            message: "stop and reconsider",
+            from: "boss",
+            poke: true,
+        });
+        const input = fs.readFileSync(path.join(agentsDir, "child-3", "input.txt"), "utf8");
+        expect(input).toMatch(/^\/poke \[from:boss\] stop and reconsider/);
+    });
+    it("appends without clobbering existing pending messages", async () => {
+        const dir = makeTask("child-4");
+        fs.writeFileSync(path.join(dir, "input.txt"), "existing line\n", "utf8");
+        await (0, sendAgentMessage_1.sendAgentMessage)({
+            taskId: "child-4",
+            message: "second",
+            from: "a",
+        });
+        const input = fs.readFileSync(path.join(dir, "input.txt"), "utf8");
+        expect(input).toBe("existing line\n[from:a] second\n");
+    });
+});
+//# sourceMappingURL=sendAgentMessage.test.js.map

package/ts_build/tests/agents/tools/sendAgentMessage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sendAgentMessage.test.js","sourceRoot":"","sources":["../../../../tests/agents/tools/sendAgentMessage.test.ts"],"names":[],"mappings":"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"}

package/ts_build/tests/agents/tools/waitForAgentCompleted.test.d.ts

@@ -0,0 +1 @@
+export {};

package/ts_build/tests/agents/tools/waitForAgentCompleted.test.js

@@ -0,0 +1,147 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const waitForAgentCompleted_1 = require("../../../src/agents/tools/waitForAgentCompleted");
+describe("waitForAgentCompleted", () => {
+    let tmpCwd;
+    let originalCwd;
+    let agentsDir;
+    beforeEach(() => {
+        originalCwd = process.cwd();
+        tmpCwd = fs.mkdtempSync(path.join(os.tmpdir(), "wait-agent-"));
+        process.chdir(tmpCwd);
+        agentsDir = path.join(tmpCwd, ".knowhow", "processes", "agents");
+        fs.mkdirSync(agentsDir, { recursive: true });
+    });
+    afterEach(() => {
+        process.chdir(originalCwd);
+        fs.rmSync(tmpCwd, { recursive: true, force: true });
+    });
+    function makeTask(taskId, meta = {}, status) {
+        const dir = path.join(agentsDir, taskId);
+        fs.mkdirSync(dir, { recursive: true });
+        fs.writeFileSync(path.join(dir, "metadata.json"), JSON.stringify({ taskId, ...meta }, null, 2), "utf8");
+        if (status !== undefined) {
+            fs.writeFileSync(path.join(dir, "status.txt"), status, "utf8");
+        }
+        return dir;
+    }
+    it("returns error when taskId missing", async () => {
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "" }));
+        expect(res.status).toBe("error");
+        expect(res.error).toMatch(/taskId is required/);
+    });
+    it("returns error when task directory does not exist", async () => {
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "nope" }));
+        expect(res.status).toBe("error");
+        expect(res.error).toMatch(/No agent task directory/);
+    });
+    it("returns immediately with structured result for a completed task", async () => {
+        makeTask("done-1", {
+            status: "completed",
+            totalCostUsd: 1.23,
+            result: "the final answer",
+            artifacts: ["a.txt"],
+        });
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "done-1" }));
+        expect(res.status).toBe("completed");
+        expect(res.costUsd).toBe(1.23);
+        expect(res.finalAnswer).toBe("the final answer");
+        expect(res.artifacts).toEqual(["a.txt"]);
+    });
+    it("falls back to last assistant message when no result field", async () => {
+        makeTask("done-2", {
+            status: "completed",
+            totalCostUsd: 0.5,
+            threads: [
+                [
+                    { role: "user", content: "do it" },
+                    { role: "assistant", content: "I did it" },
+                ],
+            ],
+        });
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "done-2" }));
+        expect(res.finalAnswer).toBe("I did it");
+    });
+    it("treats inProgress:false with no status as completed", async () => {
+        makeTask("done-3", { inProgress: false, totalCostUsd: 0.1, result: "ok" });
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({ taskId: "done-3" }));
+        expect(res.status).toBe("completed");
+    });
+    it("times out on a still-running task", async () => {
+        makeTask("running-1", { status: "running", totalCostUsd: 0.2 });
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({
+            taskId: "running-1",
+            timeoutMs: 300,
+            pollIntervalMs: 100,
+        }));
+        expect(res.timedOut).toBe(true);
+        expect(res.status).toBe("running");
+        expect(res.costUsd).toBe(0.2);
+    });
+    it("resolves when a running task transitions to completed mid-poll", async () => {
+        const dir = makeTask("running-2", { status: "running", totalCostUsd: 0 });
+        setTimeout(() => {
+            fs.writeFileSync(path.join(dir, "metadata.json"), JSON.stringify({
+                taskId: "running-2",
+                status: "completed",
+                totalCostUsd: 2.0,
+                result: "eventually done",
+            }, null, 2), "utf8");
+        }, 150);
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({
+            taskId: "running-2",
+            timeoutMs: 3000,
+            pollIntervalMs: 100,
+        }));
+        expect(res.status).toBe("completed");
+        expect(res.finalAnswer).toBe("eventually done");
+        expect(res.costUsd).toBe(2.0);
+    });
+    it("fails a task whose pid is dead without a terminal status", async () => {
+        makeTask("crashed-1", { status: "running", totalCostUsd: 0.3, pid: 999999 });
+        const res = JSON.parse(await (0, waitForAgentCompleted_1.waitForAgentCompleted)({
+            taskId: "crashed-1",
+            timeoutMs: 5000,
+            pollIntervalMs: 100,
+        }));
+        expect(res.status).toBe("failed");
+        expect(res.error).toMatch(/exited without writing a terminal status/);
+    });
+});
+//# sourceMappingURL=waitForAgentCompleted.test.js.map

package/ts_build/tests/agents/tools/waitForAgentCompleted.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"waitForAgentCompleted.test.js","sourceRoot":"","sources":["../../../../tests/agents/tools/waitForAgentCompleted.test.ts"],"names":[],"mappings":"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"}

package/ts_build/tests/chat/detach-attach-rendering.test.d.ts

@@ -0,0 +1 @@
+export {};

package/ts_build/tests/chat/detach-attach-rendering.test.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const EventService_1 = require("../../src/services/EventService");
+const EVENT_TYPES = {
+    done: "done",
+    toolCall: "tool:pre_call",
+    toolUsed: "tool:post_call",
+    agentSay: "agent:say",
+    threadUpdate: "thread_update",
+};
+class RenderingHarness {
+    _wireAgentEvents;
+    _wireTaskId;
+    _wireAgentName;
+    _wireEventTypes;
+    rendered = [];
+    wireAgentRendering(taskId, agentEvents, eventTypes, agentName) {
+        if (eventTypes.toolCall) {
+            agentEvents.setListener({ key: "agentModule:render:toolCall", event: eventTypes.toolCall }, (data) => this.rendered.push({ type: "toolCall", taskId, agentName, data }));
+        }
+        if (eventTypes.toolUsed) {
+            agentEvents.setListener({ key: "agentModule:render:toolUsed", event: eventTypes.toolUsed }, (data) => this.rendered.push({ type: "toolResult", taskId, agentName, data }));
+        }
+        if (eventTypes.agentSay) {
+            agentEvents.setListener({ key: "agentModule:render:agentSay", event: eventTypes.agentSay }, (data) => this.rendered.push({ type: "agentMessage", taskId, agentName, data }));
+        }
+        this._wireAgentEvents = agentEvents;
+        this._wireTaskId = taskId;
+        this._wireAgentName = agentName;
+        this._wireEventTypes = eventTypes;
+    }
+    unwireAgentRendering() {
+        if (this._wireAgentEvents) {
+            this._wireAgentEvents.removeManagedListenersByPrefix("agentModule:render:");
+            this._wireAgentEvents = undefined;
+        }
+        this._wireTaskId = undefined;
+        this._wireAgentName = undefined;
+        this._wireEventTypes = undefined;
+    }
+    reset() {
+        this.rendered = [];
+    }
+}
+describe("detach / re-attach rendering", () => {
+    let harness;
+    beforeEach(() => {
+        harness = new RenderingHarness();
+    });
+    it("emitted events reach the renderer after wireAgentRendering", () => {
+        const events = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
+        events.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "execCommand" } } });
+        events.emit(EVENT_TYPES.agentSay, { message: "hello" });
+        events.emit(EVENT_TYPES.toolUsed, { toolCall: {}, functionResp: "output" });
+        expect(harness.rendered).toHaveLength(3);
+        expect(harness.rendered[0].type).toBe("toolCall");
+        expect(harness.rendered[1].type).toBe("agentMessage");
+        expect(harness.rendered[2].type).toBe("toolResult");
+    });
+    it("old EventService does NOT render after unwireAgentRendering (detach)", () => {
+        const events = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
+        events.emit(EVENT_TYPES.toolCall, { toolCall: {} });
+        expect(harness.rendered).toHaveLength(1);
+        harness.reset();
+        harness.unwireAgentRendering();
+        events.emit(EVENT_TYPES.toolCall, { toolCall: {} });
+        events.emit(EVENT_TYPES.agentSay, { message: "zombie" });
+        events.emit(EVENT_TYPES.toolUsed, { toolCall: {}, functionResp: "output" });
+        expect(harness.rendered).toHaveLength(0);
+    });
+    it("events on a NEW EventService render after re-wiring (re-attach)", () => {
+        const oldEvents = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", oldEvents, EVENT_TYPES, "Dev");
+        harness.unwireAgentRendering();
+        const newEvents = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", newEvents, EVENT_TYPES, "Dev");
+        newEvents.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "readFile" } } });
+        newEvents.emit(EVENT_TYPES.agentSay, { message: "re-attached message" });
+        expect(harness.rendered).toHaveLength(2);
+        expect(harness.rendered[0].type).toBe("toolCall");
+        expect(harness.rendered[0].data.toolCall.function.name).toBe("readFile");
+        expect(harness.rendered[1].type).toBe("agentMessage");
+        expect(harness.rendered[1].data.message).toBe("re-attached message");
+    });
+    it("old EventService stays silent after re-attach on new EventService", () => {
+        const oldEvents = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", oldEvents, EVENT_TYPES, "Dev");
+        harness.unwireAgentRendering();
+        const newEvents = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", newEvents, EVENT_TYPES, "Dev");
+        newEvents.emit(EVENT_TYPES.agentSay, { message: "new" });
+        expect(harness.rendered).toHaveLength(1);
+        oldEvents.emit(EVENT_TYPES.toolCall, { toolCall: {} });
+        oldEvents.emit(EVENT_TYPES.agentSay, { message: "old" });
+        expect(harness.rendered).toHaveLength(1);
+    });
+    it("calling wireAgentRendering twice on same EventService does NOT double-render", () => {
+        const events = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
+        harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
+        events.emit(EVENT_TYPES.toolCall, { toolCall: {} });
+        expect(harness.rendered).toHaveLength(1);
+    });
+    it("full attach → detach → re-attach cycle: all phases render correctly", () => {
+        const watcher1 = new EventService_1.EventService();
+        harness.wireAgentRendering("task-A", watcher1, EVENT_TYPES, "Developer");
+        watcher1.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "execCommand" } } });
+        watcher1.emit(EVENT_TYPES.agentSay, { message: "initial work" });
+        expect(harness.rendered).toHaveLength(2);
+        harness.reset();
+        harness.unwireAgentRendering();
+        watcher1.emit(EVENT_TYPES.toolCall, { toolCall: {} });
+        watcher1.emit(EVENT_TYPES.agentSay, { message: "zombie message" });
+        expect(harness.rendered).toHaveLength(0);
+        const watcher2 = new EventService_1.EventService();
+        harness.wireAgentRendering("task-A", watcher2, EVENT_TYPES, "Developer");
+        watcher2.emit(EVENT_TYPES.toolCall, { toolCall: { function: { name: "readFile" } } });
+        watcher2.emit(EVENT_TYPES.agentSay, { message: "continuing after re-attach" });
+        expect(harness.rendered).toHaveLength(2);
+        expect(harness.rendered[0].type).toBe("toolCall");
+        expect(harness.rendered[0].data.toolCall.function.name).toBe("readFile");
+        expect(harness.rendered[1].type).toBe("agentMessage");
+        expect(harness.rendered[1].data.message).toBe("continuing after re-attach");
+    });
+    it("toolResult events render after re-attach", () => {
+        const events1 = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", events1, EVENT_TYPES, "Dev");
+        harness.unwireAgentRendering();
+        const events2 = new EventService_1.EventService();
+        harness.wireAgentRendering("task-1", events2, EVENT_TYPES, "Dev");
+        events2.emit(EVENT_TYPES.toolUsed, {
+            toolCall: { function: { name: "execCommand" } },
+            functionResp: "$ echo hello\nhello",
+        });
+        expect(harness.rendered).toHaveLength(1);
+        expect(harness.rendered[0].type).toBe("toolResult");
+        expect(harness.rendered[0].data.functionResp).toBe("$ echo hello\nhello");
+    });
+    it("3 sequential attach/detach cycles all render correctly", () => {
+        for (let i = 0; i < 3; i++) {
+            harness.reset();
+            const events = new EventService_1.EventService();
+            harness.wireAgentRendering(`task-${i}`, events, EVENT_TYPES, "Dev");
+            events.emit(EVENT_TYPES.agentSay, { message: `cycle ${i}` });
+            expect(harness.rendered).toHaveLength(1);
+            expect(harness.rendered[0].data.message).toBe(`cycle ${i}`);
+            expect(harness.rendered[0].taskId).toBe(`task-${i}`);
+            harness.unwireAgentRendering();
+            events.emit(EVENT_TYPES.agentSay, { message: "should not render" });
+            expect(harness.rendered).toHaveLength(1);
+        }
+    });
+    it("hasManagedListener reflects wired/unwired state correctly", () => {
+        const events = new EventService_1.EventService();
+        expect(events.hasManagedListener("agentModule:render:toolCall")).toBe(false);
+        expect(events.hasManagedListener("agentModule:render:agentSay")).toBe(false);
+        harness.wireAgentRendering("task-1", events, EVENT_TYPES, "Dev");
+        expect(events.hasManagedListener("agentModule:render:toolCall")).toBe(true);
+        expect(events.hasManagedListener("agentModule:render:toolUsed")).toBe(true);
+        expect(events.hasManagedListener("agentModule:render:agentSay")).toBe(true);
+        harness.unwireAgentRendering();
+        expect(events.hasManagedListener("agentModule:render:toolCall")).toBe(false);
+        expect(events.hasManagedListener("agentModule:render:agentSay")).toBe(false);
+    });
+});
+//# sourceMappingURL=detach-attach-rendering.test.js.map

package/ts_build/tests/chat/detach-attach-rendering.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"detach-attach-rendering.test.js","sourceRoot":"","sources":["../../../tests/chat/detach-attach-rendering.test.ts"],"names":[],"mappings":"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"}

package/ts_build/tests/clients/contextLimits.test.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../../src/types");
 const contextLimits_1 = require("../../src/clients/contextLimits");
+const pricing_1 = require("../../src/clients/pricing");
+const deprecatedModelIds = new Set(Object.entries({
+    ...pricing_1.OpenAiTextPricing,
+    ...pricing_1.GeminiTextPricing,
+    ...pricing_1.AnthropicTextPricing,
+    ...pricing_1.XaiTextPricing,
+})
+    .filter(([, p]) => p && p.deprecated === true)
+    .map(([id]) => id));
 describe("ContextLimits", () => {
     describe("coverage - all Models.* values have a recorded context limit", () => {
         const providers = Object.keys(types_1.Models);
@@ -13,7 +22,8 @@ describe("ContextLimits", () => {
                     expect(modelEntries.length).toBeGreaterThan(0);
                 });
                 for (const [key, modelId] of modelEntries) {
-                    it(`${provider}.${key} (${modelId}) should have a context limit`, () => {
+                    const testFn = deprecatedModelIds.has(modelId) ? it.skip : it;
+                    testFn(`${provider}.${key} (${modelId}) should have a context limit`, () => {
                         const limit = contextLimits_1.ContextLimits[modelId];
                         expect(limit).toBeDefined();
                         expect(typeof limit).toBe("number");

package/ts_build/tests/clients/contextLimits.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"contextLimits.test.js","sourceRoot":"","sources":["../../../tests/clients/contextLimits.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contextLimits.test.js","sourceRoot":"","sources":["../../../tests/clients/contextLimits.test.ts"],"names":[],"mappings":"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"}

package/ts_build/tests/clients/pricing.test.js

@@ -87,10 +87,19 @@ describe("Model Pricing Coverage", () => {
         }
         describe("Model Catalog Coverage", () => {
             const catalogIds = new Set(pricing_1.ALL_MODEL_CATALOG.map((m) => m.id));
+            const deprecatedModelIds = new Set(Object.entries({
+                ...pricing_1.OpenAiTextPricing,
+                ...pricing_1.GeminiTextPricing,
+                ...pricing_1.AnthropicTextPricing,
+                ...pricing_1.XaiTextPricing,
+            })
+                .filter(([, p]) => p && p.deprecated === true)
+                .map(([id]) => id));
             describe("All Models.* entries are in the catalog", () => {
                 for (const [provider, providerModels] of Object.entries(types_1.Models)) {
                     for (const [modelKey, modelId] of Object.entries(providerModels)) {
-                        it(`Models.${provider}.${modelKey} (${modelId}) is in ALL_MODEL_CATALOG`, () => {
+                        const testFn = deprecatedModelIds.has(modelId) ? it.skip : it;
+                        testFn(`Models.${provider}.${modelKey} (${modelId}) is in ALL_MODEL_CATALOG`, () => {
                             expect(catalogIds.has(modelId)).toBe(true);
                         });
                     }

package/ts_build/tests/clients/pricing.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"pricing.test.js","sourceRoot":"","sources":["../../../tests/clients/pricing.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pricing.test.js","sourceRoot":"","sources":["../../../tests/clients/pricing.test.ts"],"names":[],"mappings":";;AAYA,2CAayB;AAEzB,uDAQmC;AAEnC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAMtC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS;QACpC,GAAG,yBAAiB;QACpB,GAAG,yBAAiB;QACpB,GAAG,uBAAe;QAClB,GAAG,yBAAiB;QACpB,GAAG,yBAAiB;QACpB,GAAG,uBAAe;QAClB,GAAG,iCAAyB;QAC5B,GAAG,4BAAoB;QACvB,GAAG,sBAAc;QACjB,GAAG,sBAAc;QAEjB,cAAM,CAAC,MAAM,CAAC,oBAAoB;KACnC,CAAC,CAAC;IAEH,MAAM,cAAc,GAA4B;QAC9C,GAAG,2BAAiB;QACpB,GAAG,2BAAiB;QACpB,GAAG,8BAAoB;QACvB,GAAG,wBAAc;KAClB,CAAC;IAEF,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;QACnD,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAM,CAAC,EAAE,CAAC;YAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;gBACF,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAE/B,SAAS;gBACX,CAAC;gBAED,EAAE,CAAC,GAAG,QAAQ,IAAI,QAAQ,KAAK,OAAO,oBAAoB,EAAE,GAAG,EAAE;oBAC/D,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;oBACtC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;oBAC5B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CACnB,MAAM,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CACvD,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;QAC7C,MAAM,mBAAmB,GAA4B;YACnD,GAAG,2BAAiB;YACpB,GAAG,2BAAiB;SACrB,CAAC;QAEF,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAe,CAAC,EAAE,CAAC;YACzE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;gBACF,EAAE,CAAC,mBAAmB,QAAQ,IAAI,QAAQ,KAAK,OAAO,eAAe,EAAE,GAAG,EAAE;oBAC1E,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;oBAC3C,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC9B,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;QACnD,MAAM,eAAe,GAAG,yBAA0C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,sBAAc,EAAE,CAAC;YACrC,EAAE,CAAC,oBAAoB,OAAO,qBAAqB,EAAE,GAAG,EAAE;gBACxD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;QACnD,MAAM,eAAe,GAAG,yBAA0C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,sBAAc,EAAE,CAAC;YACrC,EAAE,CAAC,oBAAoB,OAAO,qBAAqB,EAAE,GAAG,EAAE;gBACxD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;gBACvC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAChD,MAAM,aAAa,GAAG,2BAA4C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,yBAAiB,EAAE,CAAC;YACxC,EAAE,CAAC,uBAAuB,OAAO,oCAAoC,EAAE,GAAG,EAAE;gBAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAChD,MAAM,aAAa,GAAG,2BAA4C,CAAC;QAEnE,KAAK,MAAM,OAAO,IAAI,yBAAiB,EAAE,CAAC;YACxC,EAAE,CAAC,uBAAuB,OAAO,oCAAoC,EAAE,GAAG,EAAE;gBAC1E,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;QAEL,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAYtC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,2BAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAG/D,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,MAAM,CAAC,OAAO,CAAC;gBACb,GAAG,2BAAiB;gBACpB,GAAG,2BAAiB;gBACpB,GAAG,8BAAoB;gBACvB,GAAG,wBAAc;aAC0B,CAAC;iBAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC;iBAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CACrB,CAAC;YAEF,QAAQ,CAAC,yCAAyC,EAAE,GAAG,EAAE;gBACvD,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAM,CAAC,EAAE,CAAC;oBAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;wBACF,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;wBAC9D,MAAM,CAAC,UAAU,QAAQ,IAAI,QAAQ,KAAK,OAAO,2BAA2B,EAAE,GAAG,EAAE;4BACjF,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBAChE,KAAK,MAAM,CAAC,QAAQ,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAe,CAAC,EAAE,CAAC;oBACzE,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,cAAwC,CACzC,EAAE,CAAC;wBACF,EAAE,CAAC,mBAAmB,QAAQ,IAAI,QAAQ,KAAK,OAAO,2BAA2B,EAAE,GAAG,EAAE;4BACtF,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC7C,CAAC,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}