@anchrd/colab-sdk 0.1.23 → 0.1.25

package/dist/skills/skills.d.ts

@@ -62,6 +62,11 @@ export declare const SkillPoint: z.ZodObject<{
 }, z.core.$strip>;
 export type SkillPoint = z.infer<typeof SkillPoint>;
 export declare const skillCaseStatuses: readonly ["passed", "failed", "missing"];
+export declare const SkillTokens: z.ZodObject<{
+    input: z.ZodInt;
+    output: z.ZodInt;
+}, z.core.$strip>;
+export type SkillTokens = z.infer<typeof SkillTokens>;
 export declare const SkillCaseResult: z.ZodObject<{
     name: z.ZodString;
     status: z.ZodEnum<{
@@ -90,6 +95,10 @@ export declare const SkillCaseResult: z.ZodObject<{
         tool: z.ZodString;
     }, z.core.$strip>>;
     costUsd: z.ZodNumber;
+    tokens: z.ZodOptional<z.ZodObject<{
+        input: z.ZodInt;
+        output: z.ZodInt;
+    }, z.core.$strip>>;
     runId: z.ZodNullable<z.ZodTemplateLiteral<`run_${string}`>>;
 }, z.core.$strip>;
 export type SkillCaseResult = z.infer<typeof SkillCaseResult>;
@@ -137,6 +146,10 @@ export declare const SkillTestReport: z.ZodObject<{
             ok: z.ZodBoolean;
         }, z.core.$strip>>;
         costUsd: z.ZodNumber;
+        tokens: z.ZodOptional<z.ZodObject<{
+            input: z.ZodInt;
+            output: z.ZodInt;
+        }, z.core.$strip>>;
     }, z.core.$strip>>;
     cases: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
@@ -166,6 +179,10 @@ export declare const SkillTestReport: z.ZodObject<{
             tool: z.ZodString;
         }, z.core.$strip>>;
         costUsd: z.ZodNumber;
+        tokens: z.ZodOptional<z.ZodObject<{
+            input: z.ZodInt;
+            output: z.ZodInt;
+        }, z.core.$strip>>;
         runId: z.ZodNullable<z.ZodTemplateLiteral<`run_${string}`>>;
     }, z.core.$strip>>;
     problem: z.ZodNullable<z.ZodString>;
@@ -232,6 +249,10 @@ export declare const SkillDetail: z.ZodObject<{
                 ok: z.ZodBoolean;
             }, z.core.$strip>>;
             costUsd: z.ZodNumber;
+            tokens: z.ZodOptional<z.ZodObject<{
+                input: z.ZodInt;
+                output: z.ZodInt;
+            }, z.core.$strip>>;
         }, z.core.$strip>>;
         cases: z.ZodArray<z.ZodObject<{
             name: z.ZodString;
@@ -261,6 +282,10 @@ export declare const SkillDetail: z.ZodObject<{
                 tool: z.ZodString;
             }, z.core.$strip>>;
             costUsd: z.ZodNumber;
+            tokens: z.ZodOptional<z.ZodObject<{
+                input: z.ZodInt;
+                output: z.ZodInt;
+            }, z.core.$strip>>;
             runId: z.ZodNullable<z.ZodTemplateLiteral<`run_${string}`>>;
         }, z.core.$strip>>;
         problem: z.ZodNullable<z.ZodString>;

package/dist/skills/skills.js

@@ -94,6 +94,8 @@ export const SkillPoint = z.object({
     reason: z.string().nullable(),
 });
 export const skillCaseStatuses = ["passed", "failed", "missing"];
+// What the model read and wrote in a step of the tests, in tokens (#835, E146).
+export const SkillTokens = z.object({ input: z.int(), output: z.int() });
 export const SkillCaseResult = z.object({
     name: z.string(),
     // passed: every run passed every point; failed: one did not; missing: a tool without a recording
@@ -110,6 +112,8 @@ export const SkillCaseResult = z.object({
     // The sandbox's writes of the last run: what it would have written, written nowhere.
     sandbox: z.array(z.object({ tool: z.string() })),
     costUsd: z.number(),
+    // The model's tokens over every run of the case (#835); absent in a report from before.
+    tokens: SkillTokens.optional(),
     // The probe run of the case's last attempt, its trace in the log.
     runId: RunId.nullable(),
 });
@@ -135,6 +139,7 @@ export const SkillTestReport = z.object({
         operator: NodePerson.nullable(),
         hits: z.array(SkillTriggerHit),
         costUsd: z.number(),
+        tokens: SkillTokens.optional(),
     })
         .nullable(),
     cases: z.array(SkillCaseResult),

package/dist/tree-order/tree-order.d.ts

@@ -0,0 +1,4 @@
+import type { NodeKind } from "../nodes/nodes.js";
+export declare const treeKindOrder: readonly ["folder", "document", "table", "board", "gadget", "file", "skill", "goal"];
+export declare function treeKindRank(kind: NodeKind): number;
+export declare function compareTreeNames(a: string, b: string): number;

package/dist/tree-order/tree-order.js

@@ -0,0 +1,24 @@
+// The order of the tree (Funktionen › Seitenbaum, #858): by kind in this order, A to Z within a kind.
+// The one place for it: the tree in the UI and `intelligence_node_list` with `sort: name` read it, so
+// an AI sees a folder the way a person does. A task never stands in the tree (E67).
+export const treeKindOrder = [
+    "folder",
+    "document",
+    "table",
+    "board",
+    "gadget",
+    "file",
+    "skill",
+    "goal",
+];
+// As in German, whatever the language of the UI: case and accents do not count, "2" before "10".
+const collator = new Intl.Collator("de", { sensitivity: "base", numeric: true });
+// A kind outside the list (a task) goes after all of them.
+export function treeKindRank(kind) {
+    const rank = treeKindOrder.indexOf(kind);
+    return rank === -1 ? treeKindOrder.length : rank;
+}
+// A hidden node's leading dot does not count: `.Intern` stands beside `Intern`.
+export function compareTreeNames(a, b) {
+    return collator.compare(a.replace(/^\./, ""), b.replace(/^\./, ""));
+}

package/dist/versions/versions.d.ts

@@ -52,11 +52,11 @@ export declare const TaskVersionChange: z.ZodEnum<{
     title: "title";
     text: "text";
     dates: "dates";
+    waiting: "waiting";
     assignee: "assignee";
     labels: "labels";
     parent: "parent";
     dependencies: "dependencies";
-    waiting: "waiting";
 }>;
 export type TaskVersionChange = z.infer<typeof TaskVersionChange>;
 export declare const TaskMove: z.ZodObject<{
@@ -168,11 +168,11 @@ export declare const NodeVersion: z.ZodObject<{
         title: "title";
         text: "text";
         dates: "dates";
+        waiting: "waiting";
         assignee: "assignee";
         labels: "labels";
         parent: "parent";
         dependencies: "dependencies";
-        waiting: "waiting";
     }>>>;
 }, z.core.$strip>;
 export type NodeVersion = z.infer<typeof NodeVersion>;
@@ -229,11 +229,11 @@ export declare const NodeVersionList: z.ZodObject<{
             title: "title";
             text: "text";
             dates: "dates";
+            waiting: "waiting";
             assignee: "assignee";
             labels: "labels";
             parent: "parent";
             dependencies: "dependencies";
-            waiting: "waiting";
         }>>>;
     }, z.core.$strip>>;
     nextCursor: z.ZodNullable<z.ZodString>;
@@ -292,11 +292,11 @@ export declare const NodeVersionDetail: z.ZodObject<{
         title: "title";
         text: "text";
         dates: "dates";
+        waiting: "waiting";
         assignee: "assignee";
         labels: "labels";
         parent: "parent";
         dependencies: "dependencies";
-        waiting: "waiting";
     }>>>;
     secret: z.ZodOptional<z.ZodLiteral<true>>;
     locked: z.ZodOptional<z.ZodBoolean>;
@@ -443,11 +443,11 @@ export declare const NodeVersionExcerpt: z.ZodObject<{
         title: "title";
         text: "text";
         dates: "dates";
+        waiting: "waiting";
         assignee: "assignee";
         labels: "labels";
         parent: "parent";
         dependencies: "dependencies";
-        waiting: "waiting";
     }>>>;
     secret: z.ZodOptional<z.ZodLiteral<true>>;
     locked: z.ZodOptional<z.ZodBoolean>;

package/dist/written/written.d.ts

@@ -175,8 +175,6 @@ export declare const Written: z.ZodObject<{
             credential_invalid: "credential_invalid";
             incomplete: "incomplete";
             no_right: "no_right";
-            no_kind: "no_kind";
-            no_assignee: "no_assignee";
             no_machine: "no_machine";
         }>;
         machineId: z.ZodOptional<z.ZodTemplateLiteral<`user_${string}`>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchrd/colab-sdk",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "Types, Zod schemas and the service client of Colab, the contract between its UI, backends and outside services.",
   "type": "module",
   "license": "UNLICENSED",