@2kw/ai 6.4.0-dev.8 → 7.0.0-dev.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -221,6 +221,25 @@ export declare const agentSchema: {
221
221
  };
222
222
  };
223
223
  };
224
+ readonly bashTool: {
225
+ readonly type: "object";
226
+ readonly additionalProperties: false;
227
+ readonly required: readonly ["type"];
228
+ readonly properties: {
229
+ readonly type: {
230
+ readonly const: "backbone.bash";
231
+ };
232
+ readonly approval: {
233
+ readonly enum: readonly ["sandbox", "pause"];
234
+ };
235
+ readonly outputs: {
236
+ readonly enum: readonly ["immediate", "held"];
237
+ };
238
+ readonly annotations: {
239
+ readonly $ref: "#/$defs/annotations";
240
+ };
241
+ };
242
+ };
224
243
  readonly functionTool: {
225
244
  readonly type: "object";
226
245
  readonly additionalProperties: false;
@@ -335,6 +354,18 @@ export declare const agentSchema: {
335
354
  readonly then: {
336
355
  readonly $ref: "#/$defs/skillTool";
337
356
  };
357
+ }, {
358
+ readonly if: {
359
+ required: string[];
360
+ properties: {
361
+ type: {
362
+ const: string;
363
+ };
364
+ };
365
+ };
366
+ readonly then: {
367
+ readonly $ref: "#/$defs/bashTool";
368
+ };
338
369
  }, {
339
370
  readonly if: {
340
371
  required: string[];
@@ -35,6 +35,7 @@ const BUILTIN_TYPES = [
35
35
  "backbone.document_convert",
36
36
  "backbone.todo",
37
37
  "backbone.skill",
38
+ "backbone.bash",
38
39
  "function",
39
40
  ];
40
41
  const typeIs = (t) => ({ required: ["type"], properties: { type: { const: t } } });
@@ -161,6 +162,19 @@ export const agentSchema = {
161
162
  skills: { type: "array", minItems: 1, maxItems: 20, uniqueItems: true, items: { type: "string", pattern: SKILL_REF } },
162
163
  },
163
164
  },
165
+ // The envelope BashToolEntryValidator accepts: no name, no requiresConfirmation, and none of
166
+ // the egress of the withdrawn per-agent network design (#925).
167
+ bashTool: {
168
+ type: "object",
169
+ additionalProperties: false,
170
+ required: ["type"],
171
+ properties: {
172
+ type: { const: "backbone.bash" },
173
+ approval: { enum: ["sandbox", "pause"] },
174
+ outputs: { enum: ["immediate", "held"] },
175
+ annotations: { $ref: "#/$defs/annotations" },
176
+ },
177
+ },
164
178
  functionTool: {
165
179
  type: "object",
166
180
  additionalProperties: false,
@@ -194,6 +208,7 @@ export const agentSchema = {
194
208
  { if: typeIs("backbone.document_convert"), then: { $ref: "#/$defs/documentConvertTool" } },
195
209
  { if: typeIs("backbone.todo"), then: { $ref: "#/$defs/todoTool" } },
196
210
  { if: typeIs("backbone.skill"), then: { $ref: "#/$defs/skillTool" } },
211
+ { if: typeIs("backbone.bash"), then: { $ref: "#/$defs/bashTool" } },
197
212
  { if: typeIs("function"), then: { $ref: "#/$defs/functionTool" } },
198
213
  {
199
214
  // The validator reports these with the reason from NON_AUTHORABLE_TOOL_TYPES; this keeps the published schema honest.
@@ -33,6 +33,8 @@ tools: []
33
33
  # - type: backbone.todo
34
34
  # - type: backbone.skill
35
35
  # skills: [skill-name@latest]
36
+ # - type: backbone.bash
37
+ # approval: sandbox
36
38
  # - type: function
37
39
  # name: lookup_order
38
40
  # description: Look up an order by number
@@ -16,8 +16,18 @@ function formatComparisonCell(result) {
16
16
  return chalk.red("ERROR");
17
17
  const scores = result.scores ?? [];
18
18
  if (scores.length > 0) {
19
- const avg = scores.reduce((sum, s) => sum + (s.score ?? 0), 0) / scores.length;
20
- return avg.toFixed(2);
19
+ // A SKIP carries a placeholder 0.0 that is not a rating, and a comment-only
20
+ // score has no number; neither takes part in the average (#693).
21
+ const rated = scores.filter((s) => s.label !== "SKIP" && s.score != null);
22
+ if (rated.length > 0) {
23
+ return (rated.reduce((sum, s) => sum + s.score, 0) / rated.length).toFixed(2);
24
+ }
25
+ // A label-only verdict (#1163) has no number; show its label, as the console does.
26
+ const verdict = scores.find((s) => s.label && s.label !== "SKIP");
27
+ if (verdict)
28
+ return String(verdict.label);
29
+ if (scores.every((s) => s.label === "SKIP"))
30
+ return chalk.dim("skipped");
21
31
  }
22
32
  return result.durationMs != null ? `${result.durationMs}ms` : chalk.dim("done");
23
33
  }
@@ -392,8 +402,14 @@ export function makeExperimentsCommand() {
392
402
  console.log(chalk.dim(`Page ${(page.number ?? 0) + 1} of ${page.totalPages ?? 0} (${page.totalElements ?? 0} total)`));
393
403
  }
394
404
  if (aggregates.length > 0) {
405
+ const skippedOf = (agg) => Object.entries((agg.skippedEvaluatorCounts ?? {}))
406
+ .filter(([, n]) => n > 0)
407
+ .map(([evaluatorId, n]) => `${evaluatorId}: ${n}`)
408
+ .join(", ");
409
+ // Only when something was skipped, so a clean run keeps its narrow table (#693).
410
+ const showSkipped = aggregates.some((agg) => skippedOf(agg) !== "");
395
411
  const aggTable = new Table({
396
- head: ["Variant", "Items", "Avg Duration", "Avg Tokens", "Total Cost"].map((h) => chalk.cyan(h)),
412
+ head: ["Variant", "Items", "Avg Duration", "Avg Tokens", "Total Cost", ...(showSkipped ? ["Skipped"] : [])].map((h) => chalk.cyan(h)),
397
413
  wordWrap: true,
398
414
  });
399
415
  for (const agg of aggregates) {
@@ -403,6 +419,7 @@ export function makeExperimentsCommand() {
403
419
  agg.avgDurationMs != null ? `${Math.round(agg.avgDurationMs)}ms` : "—",
404
420
  agg.avgTokens != null ? Math.round(agg.avgTokens) : "—",
405
421
  agg.totalCost != null ? `$${agg.totalCost}` : "—",
422
+ ...(showSkipped ? [skippedOf(agg) || "—"] : []),
406
423
  ]);
407
424
  }
408
425
  console.log(chalk.bold("\nAggregates:"));
@@ -14,7 +14,7 @@ export function makeProvidersCommand() {
14
14
  const { data } = await client.GET("/v1/providers", {
15
15
  params: { query: { search: opts.search, ...paginationParams(opts) } },
16
16
  });
17
- formatPage(data, command, ["id", "name", "type", "enabled", "createdAt"]);
17
+ formatPage(data, command, ["id", "name", "provider", "createdAt"]);
18
18
  });
19
19
  });
20
20
  cmd.addCommand(list);
@@ -36,7 +36,7 @@ export function makeProvidersCommand() {
36
36
  .description("Create a new provider")
37
37
  .requiredOption("-n, --name <name>", "Provider name")
38
38
  .requiredOption("--type <type>", "Provider type (openai, azure_openai, anthropic, xai, mistral, ollama)")
39
- .requiredOption("--provider-api-key <key>", "API key for the AI provider")
39
+ .option("--provider-api-key <key>", "API key for the AI provider (not needed for ollama)")
40
40
  .option("-c, --config <json>", "Provider config as JSON")
41
41
  .action(async (opts, command) => {
42
42
  await runAction(command, async () => {
@@ -54,7 +54,6 @@ export function makeProvidersCommand() {
54
54
  .argument("<id>", "Provider ID")
55
55
  .option("-n, --name <name>", "New name")
56
56
  .option("--type <type>", "New type")
57
- .option("--enabled <bool>", "Enable/disable")
58
57
  .option("-c, --config <json>", "New config as JSON")
59
58
  .action(async (id, opts, command) => {
60
59
  await runAction(command, async () => {
@@ -64,8 +63,6 @@ export function makeProvidersCommand() {
64
63
  body.name = opts.name;
65
64
  if (opts.type)
66
65
  body.provider = opts.type.toUpperCase();
67
- if (opts.enabled !== undefined)
68
- body.enabled = opts.enabled === "true";
69
66
  if (opts.config)
70
67
  body.config = JSON.parse(opts.config);
71
68
  const { data } = await client.PATCH("/v1/providers/{id}", {
@@ -95,13 +92,7 @@ export function makeProvidersCommand() {
95
92
  await runAction(command, async () => {
96
93
  const client = getClient(command);
97
94
  const { data } = await client.GET("/v1/providers/all");
98
- formatList(data, command, [
99
- "id",
100
- "name",
101
- "provider",
102
- "enabled",
103
- "createdAt",
104
- ]);
95
+ formatList(data, command, ["id", "name", "provider", "createdAt"]);
105
96
  });
106
97
  });
107
98
  cmd
@@ -116,6 +116,9 @@ export declare function parseAgentModel(model?: string): {
116
116
  * clipboard. Newlines and tabs stay. JSON output is never passed through this.
117
117
  */
118
118
  export declare function stripControl(s: string): string;
119
+ export declare function hasInvisible(s: string): boolean;
120
+ /** Replaces each hidden code point with a visible `<U+XXXX>`, so approving a diff means having seen it. */
121
+ export declare function revealInvisible(s: string): string;
119
122
  export declare function shellQuote(value: string): string;
120
123
  /** "Connect a (h), allow the agent to use b (h) and reconnect c (h)". */
121
124
  export declare function connectionsSentence(connections: PendingConnection[]): string;
@@ -89,6 +89,39 @@ const CONTROL_CHARS = /[\x00-\x08\x0b-\x1f\x7f-\x9f]/g;
89
89
  export function stripControl(s) {
90
90
  return s.replace(CONTROL_CHARS, "");
91
91
  }
92
+ /**
93
+ * Code points that print as nothing, or reorder what surrounds them, yet reach the model: Unicode
94
+ * tags, zero-width characters, directional marks, embeddings, overrides and isolates, the word
95
+ * joiner and the byte-order mark (#1027). As numbers, not an escaped regex, so no tool can fold
96
+ * them into the source. Kept in step with `surface/src/core/skills-apply-preview.ts`.
97
+ */
98
+ const INVISIBLE_RANGES = [
99
+ [0xe0000, 0xe007f],
100
+ [0x200b, 0x200f],
101
+ [0x202a, 0x202e],
102
+ [0x2060, 0x2060],
103
+ [0x2066, 0x2069],
104
+ [0x061c, 0x061c],
105
+ [0xfeff, 0xfeff],
106
+ ];
107
+ function isInvisible(codePoint) {
108
+ return INVISIBLE_RANGES.some(([low, high]) => codePoint >= low && codePoint <= high);
109
+ }
110
+ export function hasInvisible(s) {
111
+ for (const char of s)
112
+ if (isInvisible(char.codePointAt(0)))
113
+ return true;
114
+ return false;
115
+ }
116
+ /** Replaces each hidden code point with a visible `<U+XXXX>`, so approving a diff means having seen it. */
117
+ export function revealInvisible(s) {
118
+ let out = "";
119
+ for (const char of s) {
120
+ const codePoint = char.codePointAt(0);
121
+ out += isInvisible(codePoint) ? `<U+${codePoint.toString(16).toUpperCase().padStart(4, "0")}>` : char;
122
+ }
123
+ return out;
124
+ }
92
125
  export function shellQuote(value) {
93
126
  if (/^[A-Za-z0-9._@/:-]+$/.test(value))
94
127
  return value;
@@ -1,6 +1,6 @@
1
1
  import { createInterface } from "node:readline/promises";
2
2
  import chalk from "chalk";
3
- import { stripControl } from "./agent-run.js";
3
+ import { hasInvisible, revealInvisible, stripControl } from "./agent-run.js";
4
4
  import { REMEMBER_NOTE, previewIsIncomplete, previewLines } from "./skills-apply-preview.js";
5
5
  /** Raised when the prompt's input closes (EOF, Ctrl+C, Ctrl+D) before an answer arrives. */
6
6
  export class PromptAbortedError extends Error {
@@ -50,7 +50,7 @@ export function readlineAsk(input = process.stdin, output = process.stderr) {
50
50
  }
51
51
  export async function promptApprovals(pending, ask, write = (line) => console.error(line)) {
52
52
  const answers = new Map();
53
- const s = stripControl;
53
+ const s = (value) => revealInvisible(stripControl(value));
54
54
  for (const [index, a] of pending.entries()) {
55
55
  // A connector approval carries no policy class (#949): "unknown" may be destructive, so it is never
56
56
  // offered a standing grant here; the server drops one for a destructive row anyway.
@@ -62,7 +62,12 @@ export async function promptApprovals(pending, ask, write = (line) => console.er
62
62
  // A SkillsApply change reads as its diff (#782, spec §10). When the preview leaves changes
63
63
  // out, the full arguments follow it: this prompt never runs with --json, so it is the only
64
64
  // place the member can read what would persist (spec D7).
65
- for (const line of previewLines(a.preview))
65
+ const lines = previewLines(a.preview);
66
+ // Hidden characters are shown as <U+XXXX> below; the warning says why (#1027, spec D7).
67
+ if (lines.some(hasInvisible)) {
68
+ write(chalk.yellow("Hidden characters found: shown as <U+XXXX>. A model reads them; you would not see them. Check each marked line before you approve."));
69
+ }
70
+ for (const line of lines)
66
71
  write(colourPreviewLine(s(line)));
67
72
  if (previewIsIncomplete(a.preview)) {
68
73
  write(chalk.dim("Full request (the preview leaves changes out):"));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@2kw/ai",
3
- "version": "6.4.0-dev.8",
3
+ "version": "7.0.0-dev.4",
4
4
  "description": "CLI for 2kw.ai — schema-driven document extraction, an OpenAI-compatible EU LLM gateway, transcription, prompts, datasets, and experiments from your terminal or agentic workflows. Ships as 2kw, backbone, and bb.",
5
5
  "keywords": [
6
6
  "cli",