@cotal-ai/cli 0.57.0 → 0.59.0
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.
- package/dist/commands/agents.d.ts +29 -26
- package/dist/commands/agents.d.ts.map +1 -1
- package/dist/commands/agents.js +103 -38
- package/dist/commands/agents.js.map +1 -1
- package/dist/commands/backup.d.ts.map +1 -1
- package/dist/commands/backup.js +2 -1
- package/dist/commands/backup.js.map +1 -1
- package/dist/commands/down-manifest.js +0 -4
- package/dist/commands/down-manifest.js.map +1 -1
- package/dist/commands/down.d.ts +3 -2
- package/dist/commands/down.d.ts.map +1 -1
- package/dist/commands/down.js +8 -7
- package/dist/commands/down.js.map +1 -1
- package/dist/commands/endpoints.js +2 -2
- package/dist/commands/endpoints.js.map +1 -1
- package/dist/commands/meshes-add.d.ts +0 -3
- package/dist/commands/meshes-add.d.ts.map +1 -1
- package/dist/commands/meshes-add.js +0 -3
- package/dist/commands/meshes-add.js.map +1 -1
- package/dist/commands/mint.d.ts +0 -9
- package/dist/commands/mint.d.ts.map +1 -1
- package/dist/commands/mint.js +9 -9
- package/dist/commands/mint.js.map +1 -1
- package/dist/commands/service.d.ts.map +1 -1
- package/dist/commands/service.js +91 -29
- package/dist/commands/service.js.map +1 -1
- package/dist/commands/setup.d.ts +2 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +29 -6
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/spawn.d.ts +18 -0
- package/dist/commands/spawn.d.ts.map +1 -1
- package/dist/commands/spawn.js +30 -20
- package/dist/commands/spawn.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +28 -28
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/up.d.ts +0 -4
- package/dist/commands/up.d.ts.map +1 -1
- package/dist/commands/up.js +260 -73
- package/dist/commands/up.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/assist.d.ts +10 -7
- package/dist/lib/assist.d.ts.map +1 -1
- package/dist/lib/assist.js +20 -31
- package/dist/lib/assist.js.map +1 -1
- package/dist/lib/auth-proc.d.ts.map +1 -1
- package/dist/lib/auth-proc.js +22 -19
- package/dist/lib/auth-proc.js.map +1 -1
- package/dist/lib/control.d.ts +3 -2
- package/dist/lib/control.d.ts.map +1 -1
- package/dist/lib/control.js.map +1 -1
- package/dist/lib/delivery-proc.d.ts.map +1 -1
- package/dist/lib/delivery-proc.js +13 -13
- package/dist/lib/delivery-proc.js.map +1 -1
- package/dist/lib/delivery-responder.d.ts +12 -2
- package/dist/lib/delivery-responder.d.ts.map +1 -1
- package/dist/lib/delivery-responder.js +3 -13
- package/dist/lib/delivery-responder.js.map +1 -1
- package/dist/lib/ext-mutation.d.ts.map +1 -1
- package/dist/lib/ext-mutation.js.map +1 -1
- package/dist/lib/manager-proc.d.ts +4 -4
- package/dist/lib/manager-proc.d.ts.map +1 -1
- package/dist/lib/manager-proc.js +22 -20
- package/dist/lib/manager-proc.js.map +1 -1
- package/dist/lib/restore.d.ts.map +1 -1
- package/dist/lib/restore.js +2 -2
- package/dist/lib/restore.js.map +1 -1
- package/dist/lib/self-exec.d.ts.map +1 -1
- package/dist/lib/self-exec.js +38 -13
- package/dist/lib/self-exec.js.map +1 -1
- package/dist/lib/status.d.ts +19 -9
- package/dist/lib/status.d.ts.map +1 -1
- package/dist/lib/status.js +41 -54
- package/dist/lib/status.js.map +1 -1
- package/dist/lib/steps.d.ts +7 -3
- package/dist/lib/steps.d.ts.map +1 -1
- package/dist/lib/steps.js +22 -10
- package/dist/lib/steps.js.map +1 -1
- package/dist/lib/theme.d.ts.map +1 -1
- package/dist/lib/theme.js +3 -2
- package/dist/lib/theme.js.map +1 -1
- package/dist/seed/reconcile.d.ts.map +1 -1
- package/dist/seed/reconcile.js +13 -9
- package/dist/seed/reconcile.js.map +1 -1
- package/dist/ui.d.ts +13 -0
- package/dist/ui.d.ts.map +1 -1
- package/dist/ui.js +21 -0
- package/dist/ui.js.map +1 -1
- package/package.json +7 -7
package/dist/lib/status.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { spawnSync } from "node:child_process";
|
|
2
1
|
import { accessSync, constants } from "node:fs";
|
|
3
2
|
import { connect } from "node:net";
|
|
4
3
|
import { delimiter, join } from "node:path";
|
|
5
|
-
import { DEFAULT_SERVER, DEFAULT_SPACE, isReachable } from "@cotal-ai/core";
|
|
6
|
-
import { authDir, findCotalRoot, loadSoleSpaceAuth, loadSpaceAuth, resolveMeshTarget } from "@cotal-ai/workspace";
|
|
4
|
+
import { DEFAULT_SERVER, DEFAULT_SPACE, isReachable, registry } from "@cotal-ai/core";
|
|
5
|
+
import { authDir, extensionConnectors, findCotalRoot, loadExtensionsManifest, loadSoleSpaceAuth, loadSpaceAuth, resolveMeshTarget } from "@cotal-ai/workspace";
|
|
6
|
+
import { materializeExtension } from "../ext-loader.js";
|
|
7
7
|
import { resolveNatsServer } from "./nats-bin.js";
|
|
8
|
+
import { displayCmd } from "./self-exec.js";
|
|
8
9
|
import { cliVersion } from "./version.js";
|
|
9
10
|
// Moved into `@cotal-ai/workspace` (stage 4); re-exported for the CLI's many importers.
|
|
10
11
|
export { resolveRuntimeSpace, resolveSpace } from "@cotal-ai/workspace";
|
|
@@ -61,39 +62,44 @@ export async function machineStatus() {
|
|
|
61
62
|
catch {
|
|
62
63
|
nats = "missing";
|
|
63
64
|
}
|
|
64
|
-
|
|
65
|
-
// once for the JSON listing and once for a plain-text grep — two full process startups for data a
|
|
66
|
-
// single listing already contains.
|
|
67
|
-
const plugins = claudePluginList();
|
|
68
|
-
return {
|
|
69
|
-
nats,
|
|
70
|
-
claudePlugin: claudePluginInstalled(plugins),
|
|
71
|
-
claudeSkills: claudeSkillsState(plugins),
|
|
72
|
-
agents: {
|
|
73
|
-
claude: onPath("claude"),
|
|
74
|
-
opencode: onPath("opencode"),
|
|
75
|
-
},
|
|
76
|
-
};
|
|
65
|
+
return { nats };
|
|
77
66
|
}
|
|
78
|
-
/**
|
|
79
|
-
*
|
|
80
|
-
*
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
67
|
+
/** Every connector this machine can launch, read off each connector's own `requires` rather than a list
|
|
68
|
+
* of harness names: the live registry plus the installed extension manifest's cached requirements, so
|
|
69
|
+
* status never imports connector code. A manifest that cannot answer throws, like every other reader. */
|
|
70
|
+
export function connectorHarnesses() {
|
|
71
|
+
const declared = new Map();
|
|
72
|
+
for (const ext of loadExtensionsManifest().extensions)
|
|
73
|
+
for (const connector of extensionConnectors(ext))
|
|
74
|
+
declared.set(connector.name, { requires: connector.requires, setup: connector.setup });
|
|
75
|
+
for (const connector of registry.all("connector"))
|
|
76
|
+
declared.set(connector.name, { requires: connector.requires ?? [], setup: connector.setup ?? null });
|
|
77
|
+
return [...declared]
|
|
78
|
+
.sort(([a], [b]) => a.localeCompare(b))
|
|
79
|
+
.map(([name, { requires, setup }]) => ({ name, requires, missing: requires.filter((bin) => !onPath(bin)), setup }));
|
|
80
|
+
}
|
|
81
|
+
/** The rows each connector's setup provider reports about what it installed. Only a connector that
|
|
82
|
+
* declares a provider is imported; one whose cached metadata predates the setup ref is read from the
|
|
83
|
+
* connector itself. A declared provider that cannot be resolved renders as one red row naming the
|
|
84
|
+
* error, so the rest of status still prints. */
|
|
85
|
+
export async function connectorStatusRows(harnesses) {
|
|
86
|
+
const input = { version: cliVersion(), skillsRemedy: `${displayCmd()} setup --skills` };
|
|
87
|
+
const rows = [];
|
|
88
|
+
for (const harness of harnesses) {
|
|
89
|
+
try {
|
|
90
|
+
const setup = harness.setup === undefined
|
|
91
|
+
? (await materializeExtension({ kind: "connector", name: harness.name })).setup
|
|
92
|
+
: harness.setup;
|
|
93
|
+
if (!setup)
|
|
94
|
+
continue;
|
|
95
|
+
const provider = await materializeExtension(setup);
|
|
96
|
+
rows.push(...(provider.status?.(input) ?? []));
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
rows.push({ label: `${harness.name} setup`, state: "error", text: e.message });
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
return rows;
|
|
97
103
|
}
|
|
98
104
|
export function onPath(bin) {
|
|
99
105
|
const exts = process.platform === "win32"
|
|
@@ -116,23 +122,4 @@ export function onPath(bin) {
|
|
|
116
122
|
}
|
|
117
123
|
return false;
|
|
118
124
|
}
|
|
119
|
-
function claudePluginInstalled(entries) {
|
|
120
|
-
return entries?.some((e) => e.id === "cotal@cotal-mesh") ?? false;
|
|
121
|
-
}
|
|
122
|
-
/** The installed Claude Code plugins, or undefined when Claude is not on PATH or cannot be queried
|
|
123
|
-
* (both of which every caller renders as "unknown" rather than "absent"). ONE spawn, shared. */
|
|
124
|
-
function claudePluginList() {
|
|
125
|
-
if (!onPath("claude"))
|
|
126
|
-
return undefined;
|
|
127
|
-
const r = spawnSync("claude", ["plugin", "list", "--json"], { encoding: "utf8" });
|
|
128
|
-
if (r.status !== 0)
|
|
129
|
-
return undefined;
|
|
130
|
-
try {
|
|
131
|
-
const parsed = JSON.parse(r.stdout ?? "[]");
|
|
132
|
-
return Array.isArray(parsed) ? parsed : undefined;
|
|
133
|
-
}
|
|
134
|
-
catch {
|
|
135
|
-
return undefined;
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
125
|
//# sourceMappingURL=status.js.map
|
package/dist/lib/status.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/lib/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/lib/status.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/steps.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import type { ConnectorAssist } from "@cotal-ai/core";
|
|
1
2
|
import type { SetupLog } from "./setup-log.js";
|
|
2
3
|
export interface Step {
|
|
3
|
-
/** Slug used in the log and the
|
|
4
|
+
/** Slug used in the log and the debug handoff prompt. */
|
|
4
5
|
name: string;
|
|
5
6
|
/** Human line shown while the step runs. */
|
|
6
7
|
title: string;
|
|
@@ -14,12 +15,14 @@ export interface Step {
|
|
|
14
15
|
confirm?: string;
|
|
15
16
|
/** The step draws its own live pane; the runner shows no spinner, just the result line. */
|
|
16
17
|
live?: boolean;
|
|
17
|
-
/** Paths/URLs
|
|
18
|
+
/** Paths/URLs the debug handoff should read when this step fails. */
|
|
18
19
|
context?: string[];
|
|
19
20
|
/** Throw to fail; a returned string becomes the detail on the result line. */
|
|
20
21
|
run(): Promise<string | void>;
|
|
21
22
|
}
|
|
22
|
-
/**
|
|
23
|
+
/** Debug handoffs the failure menu may offer, resolved only when a step fails. */
|
|
24
|
+
export type AssistSource = () => Promise<readonly ConnectorAssist[]>;
|
|
25
|
+
/** Run steps in order with a failure loop per step: offer each debug handoff `assists` yields, then
|
|
23
26
|
* retry / skip / quit. Returns false on abort.
|
|
24
27
|
*
|
|
25
28
|
* `yes` is non-interactive accept-all (agents/CI): optional and `confirm` steps run
|
|
@@ -27,5 +30,6 @@ export interface Step {
|
|
|
27
30
|
* log path instead of opening the recovery menu/handoff, even on a TTY. */
|
|
28
31
|
export declare function runSteps(steps: Step[], log: SetupLog, opts?: {
|
|
29
32
|
yes?: boolean;
|
|
33
|
+
assists?: AssistSource;
|
|
30
34
|
}): Promise<boolean>;
|
|
31
35
|
//# sourceMappingURL=steps.d.ts.map
|
package/dist/lib/steps.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"steps.d.ts","sourceRoot":"","sources":["../../src/lib/steps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"steps.d.ts","sourceRoot":"","sources":["../../src/lib/steps.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAItD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,WAAW,IAAI;IACnB,yDAAyD;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,oEAAoE;IACpE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4EAA4E;IAC5E,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;2DAEuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,2FAA2F;IAC3F,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,8EAA8E;IAC9E,GAAG,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC/B;AAED,kFAAkF;AAClF,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAAC;AAErE;;;;;4EAK4E;AAC5E,wBAAsB,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,YAAY,CAAA;CAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAiBnI"}
|
package/dist/lib/steps.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as p from "@clack/prompts";
|
|
2
2
|
import { dim } from "./theme.js";
|
|
3
3
|
import { abortIfCancel } from "./cancel.js";
|
|
4
|
-
import {
|
|
5
|
-
/** Run steps in order with a failure loop per step: offer
|
|
4
|
+
import { assistAllowed, noAssistLine, runHandoff } from "./assist.js";
|
|
5
|
+
/** Run steps in order with a failure loop per step: offer each debug handoff `assists` yields, then
|
|
6
6
|
* retry / skip / quit. Returns false on abort.
|
|
7
7
|
*
|
|
8
8
|
* `yes` is non-interactive accept-all (agents/CI): optional and `confirm` steps run
|
|
@@ -22,12 +22,12 @@ export async function runSteps(steps, log, opts = {}) {
|
|
|
22
22
|
log.line(`${step.name}: skipped (declined consent)`);
|
|
23
23
|
continue;
|
|
24
24
|
}
|
|
25
|
-
if (!(await runOne(step, log, interactive)))
|
|
25
|
+
if (!(await runOne(step, log, interactive, opts.assists)))
|
|
26
26
|
return false;
|
|
27
27
|
}
|
|
28
28
|
return true;
|
|
29
29
|
}
|
|
30
|
-
async function runOne(step, log, interactive) {
|
|
30
|
+
async function runOne(step, log, interactive, assists) {
|
|
31
31
|
for (;;) {
|
|
32
32
|
if (step.explain)
|
|
33
33
|
p.log.step(step.explain);
|
|
@@ -54,9 +54,9 @@ async function runOne(step, log, interactive) {
|
|
|
54
54
|
p.log.message(dim(`See ${log.path}`));
|
|
55
55
|
return false;
|
|
56
56
|
}
|
|
57
|
-
const choice = await failureMenu(step);
|
|
58
|
-
if (choice === "
|
|
59
|
-
await runHandoff({ step: step.name, error: err, context: step.context ?? [], logPath: log.path });
|
|
57
|
+
const choice = await failureMenu(step, assists);
|
|
58
|
+
if (typeof choice === "object") {
|
|
59
|
+
await runHandoff(choice, { step: step.name, error: err, context: step.context ?? [], logPath: log.path });
|
|
60
60
|
continue;
|
|
61
61
|
}
|
|
62
62
|
if (choice === "retry")
|
|
@@ -73,10 +73,22 @@ async function runOne(step, log, interactive) {
|
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
|
-
async function failureMenu(step) {
|
|
76
|
+
async function failureMenu(step, assists) {
|
|
77
77
|
const options = [{ value: "retry", label: "Retry this step" }];
|
|
78
|
-
if (
|
|
79
|
-
|
|
78
|
+
if (assistAllowed()) {
|
|
79
|
+
let handoffs = [];
|
|
80
|
+
let reason = "no installed connector offers one with its harness on PATH";
|
|
81
|
+
try {
|
|
82
|
+
handoffs = (await assists?.()) ?? [];
|
|
83
|
+
}
|
|
84
|
+
catch (e) {
|
|
85
|
+
reason = `connector discovery failed: ${e.message}`;
|
|
86
|
+
}
|
|
87
|
+
for (const assist of handoffs)
|
|
88
|
+
options.push({ value: assist, label: `Debug it with ${assist.title}` });
|
|
89
|
+
if (!handoffs.length)
|
|
90
|
+
p.log.message(noAssistLine(reason));
|
|
91
|
+
}
|
|
80
92
|
options.push({ value: "skip", label: step.optional ? "Skip it" : "Skip (may abort)" });
|
|
81
93
|
options.push({ value: "quit", label: "Quit setup" });
|
|
82
94
|
const choice = await p.select({ message: "What now?", options });
|
package/dist/lib/steps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../src/lib/steps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"steps.js","sourceRoot":"","sources":["../../src/lib/steps.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/theme.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/lib/theme.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"theme.d.ts","sourceRoot":"","sources":["../../src/lib/theme.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,KAAK,GAAI,GAAG,MAAM,WAAkB,CAAC;AAClD,eAAO,MAAM,SAAS,GAAI,GAAG,MAAM,WAAwB,CAAC;AAC5D,eAAO,MAAM,EAAE,GAAI,GAAG,MAAM,WAAyE,CAAC;AACtG,eAAO,MAAM,GAAG,GAAI,GAAG,MAAM,WAA0C,CAAC;AACxE,eAAO,MAAM,IAAI,GAAI,GAAG,MAAM,WAA0C,CAAC;AAEzE;oFACoF;AACpF,eAAO,MAAM,SAAS,GAAI,GAAG,MAAM,KAAG,MAIvB,CAAC;AAEhB,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAI9C;AAED,qFAAqF;AACrF,wBAAgB,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,SAAI,GAAG,MAAM,CAGjD;AAED,gDAAgD;AAChD,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAE1D;AASD;kEACkE;AAClE,wBAAgB,MAAM,IAAI,IAAI,CAG7B"}
|
package/dist/lib/theme.js
CHANGED
|
@@ -3,12 +3,13 @@
|
|
|
3
3
|
* (implementations/cli/src/web/index.html): brand blue #58a6ff, success green #3fb950.
|
|
4
4
|
*
|
|
5
5
|
* Rendering gates (same as the rest of the CLI's color story):
|
|
6
|
-
* -
|
|
6
|
+
* - `colorEnabled()` is false → plain text, no ANSI (no TTY, NO_COLOR, FORCE_COLOR=0)
|
|
7
7
|
* - COLORTERM truecolor/24bit → 24-bit ANSI (exact brand color)
|
|
8
8
|
* - otherwise → 16-color fallback
|
|
9
9
|
*/
|
|
10
10
|
import * as p from "@clack/prompts";
|
|
11
|
-
|
|
11
|
+
import { colorEnabled } from "@cotal-ai/workspace";
|
|
12
|
+
const USE_ANSI = colorEnabled();
|
|
12
13
|
const TRUECOLOR = USE_ANSI && (process.env.COLORTERM === "truecolor" || process.env.COLORTERM === "24bit");
|
|
13
14
|
const BRAND = [88, 166, 255]; // #58a6ff
|
|
14
15
|
const GREEN = [63, 185, 80]; // #3fb950
|
package/dist/lib/theme.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/lib/theme.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/lib/theme.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/seed/reconcile.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reconcile.d.ts","sourceRoot":"","sources":["../../src/seed/reconcile.ts"],"names":[],"mappings":"AAuEA,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,4FAA4F;AAC5F,wBAAsB,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,4FAA4F;AAC5F,wBAAsB,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAY7D;AAmfD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAyB1D"}
|
package/dist/seed/reconcile.js
CHANGED
|
@@ -2,7 +2,7 @@ import { existsSync, readFileSync, renameSync } from "node:fs";
|
|
|
2
2
|
import { spawnSync } from "node:child_process";
|
|
3
3
|
import { randomBytes } from "node:crypto";
|
|
4
4
|
import { join } from "node:path";
|
|
5
|
-
import { SEEDED_EXTENSIONS, extensionPackageDir, installedExtensionVersion, loadExtensionsManifest, quarantineExtensionsManifest, } from "@cotal-ai/workspace";
|
|
5
|
+
import { SEEDED_EXTENSIONS, connectorMetadataStale, extensionPackageDir, installedExtensionVersion, loadExtensionsManifest, quarantineExtensionsManifest, } from "@cotal-ai/workspace";
|
|
6
6
|
import { c } from "../ui.js";
|
|
7
7
|
import { selfArgv, verifiedCotalExecutables } from "../lib/self-exec.js";
|
|
8
8
|
import { claimExtensionMutation } from "../lib/ext-mutation.js";
|
|
@@ -134,13 +134,12 @@ function builtinsAccounted() {
|
|
|
134
134
|
}
|
|
135
135
|
/** A package can add a registry provider without changing the seed generation in a source checkout.
|
|
136
136
|
* The fast path must not preserve an older manifest that advertises only a subset of what the packed
|
|
137
|
-
* built-in now registers, or lazy materialization of the new provider can never find its owner.
|
|
137
|
+
* built-in now registers, or lazy materialization of the new provider can never find its owner. An
|
|
138
|
+
* entry whose connector metadata predates the cached setup ref is that older manifest. */
|
|
138
139
|
function builtinsMetadataCurrent() {
|
|
139
140
|
for (const name of SEED_BUILTINS) {
|
|
140
141
|
const entry = installedEntry(name);
|
|
141
|
-
if (
|
|
142
|
-
continue;
|
|
143
|
-
if (name === "claude" && !entry.provides?.some((ref) => ref.kind === "connector-setup" && ref.name === "claude"))
|
|
142
|
+
if (entry?.source === "seeded" && connectorMetadataStale(entry))
|
|
144
143
|
return false;
|
|
145
144
|
}
|
|
146
145
|
return true;
|
|
@@ -259,7 +258,7 @@ async function runUnderLocks(mode, generation, nonce) {
|
|
|
259
258
|
// is never auto-refreshed on upgrade — only --force may replace it.
|
|
260
259
|
const isSeeded = entry.source === "seeded";
|
|
261
260
|
const torn = mode === "repair" && isSeeded && (repairAllSeeded || !isIntact(name));
|
|
262
|
-
const metadataStale = isSeeded &&
|
|
261
|
+
const metadataStale = isSeeded && connectorMetadataStale(entry);
|
|
263
262
|
const refresh = mode === "force" || torn || metadataStale || (isSeeded && isStrictlyNewer(generation, stampGen));
|
|
264
263
|
if (refresh) {
|
|
265
264
|
seedOne(name, generation, nonce, true);
|
|
@@ -419,13 +418,18 @@ function resolveEverSeeded(mode, generation) {
|
|
|
419
418
|
* The child is authenticated: it carries the live reconcile lock's nonce + this parent's PID so a
|
|
420
419
|
* forged `COTAL_EXT_SEEDING` can't skip the mutation lock for an arbitrary `ext add`. */
|
|
421
420
|
function seedOne(name, generation, nonce, force) {
|
|
421
|
+
// The re-exec entry is validated BEFORE anything is journaled (#1629). Asked after the cursor, the
|
|
422
|
+
// staged payload and the pending child marker, a refusal left all three with no child to clear the
|
|
423
|
+
// marker, and every later boot, `cotal ext seed --repair` included, refused as a seed that may be
|
|
424
|
+
// mid-flight until the marker was removed by hand.
|
|
425
|
+
//
|
|
426
|
+
// The pending marker records intent to spawn BEFORE the spawn, so the orphan window never opens
|
|
427
|
+
// ownerless: a repair after a parent SIGKILL sees it and fails loud rather than racing the installer.
|
|
428
|
+
const [bin, ...argv] = selfArgv();
|
|
422
429
|
writeCursor({ nonce, package: name, phase: "copy" });
|
|
423
430
|
const storePath = stageSeedPayload(generation, name, { force });
|
|
424
431
|
writeCursor({ nonce, package: name, phase: "add" });
|
|
425
|
-
// Record intent to spawn BEFORE the spawn, so the orphan window never opens ownerless: a repair
|
|
426
|
-
// after a parent SIGKILL sees this pending marker and fails loud rather than racing the installer.
|
|
427
432
|
writePendingChildMarker(nonce);
|
|
428
|
-
const [bin, ...argv] = selfArgv();
|
|
429
433
|
const r = spawnSync(bin, [...argv, "ext", "add", storePath], {
|
|
430
434
|
encoding: "utf8",
|
|
431
435
|
env: { ...process.env, COTAL_EXT_SEEDING: nonce, COTAL_EXT_SEEDING_PARENT: String(process.pid) },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/seed/reconcile.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reconcile.js","sourceRoot":"","sources":["../../src/seed/reconcile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACtB,mBAAmB,EACnB,yBAAyB,EACzB,sBAAsB,EACtB,4BAA4B,GAE7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAe,MAAM,YAAY,CAAC;AACtJ,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,aAAa,EACb,UAAU,EACV,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,yBAAyB,EACzB,eAAe,EAEf,WAAW,EACX,uBAAuB,EACvB,aAAa,GACd,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,aAAa,EACb,eAAe,EACf,0BAA0B,EAC1B,aAAa,EACb,SAAS,EACT,WAAW,EACX,0BAA0B,EAC1B,cAAc,EACd,UAAU,GAEX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAuC3D,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,yBAAyB;IAC7C,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,KAAgB;IAC5C,MAAM,IAAI,GAAS,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;IACpG,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IACD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3E,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,aAAa,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpF,IAAI,MAAM,CAAC,WAAW,CAAC,MAAM;QAAE,KAAK,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3F,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1G,CAAC;AAED,MAAM,IAAI,GAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;AAEzF,KAAK,UAAU,SAAS,CAAC,IAAU;IACjC,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;IACpC,mGAAmG;IACnG,qGAAqG;IACrG,2DAA2D;IAC3D,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;QAC5B,2FAA2F;QAC3F,6FAA6F;QAC7F,0FAA0F;QAC1F,IAAI,MAAM,IAAI,eAAe,EAAE,EAAE,CAAC;YAChC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;gBAChC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;oBACvB,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,GAAG,gDAAgD,CAAC,CAAC;gBAC5G,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;oBAC5B,MAAM,IAAI,KAAK,CAAC,8CAA8C,KAAK,CAAC,IAAI,qFAAqF,CAAC,CAAC;gBACjK,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9E,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;oBACxB,OAAO,CAAC,KAAK,CACX,CAAC,CAAC,GAAG,CACH,yDAAyD,SAAS,CAAC,IAAI,OAAO,UAAU,IAAI;wBAC1F,YAAY,MAAM,CAAC,OAAO,YAAY,MAAM,CAAC,KAAK,KAAK,CAC1D,CACF,CAAC;oBACF,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;oBAC1B,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,eAAe,GAAG,SAAS,EAAE,EAAE,UAAU,IAAI,QAAQ,CAAC;oBAC5D,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,CAAC,OAAO,YAAY,MAAM,CAAC,KAAK,IAAI;wBAC/F,yBAAyB,eAAe,wBAAwB,UAAU,IAAI;wBAC9E,wEAAwE,CAC3E,CAAC;gBACJ,CAAC;gBACD,MAAM,IAAI,KAAK,CACb,kHAAkH;oBAChH,+BAA+B,CAClC,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,IAAI,WAAW,EAAE,IAAI,eAAe,EAAE,IAAI,iBAAiB,EAAE,IAAI,uBAAuB,EAAE,IAAI,SAAS,EAAE,EAAE,UAAU,KAAK,UAAU,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;YACtK,+FAA+F;YAC/F,4FAA4F;YAC5F,2FAA2F;YAC3F,4DAA4D;YAC5D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,wBAAwB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,oBAAoB,EAAE,CAAC;IACpC,IAAI,CAAC;QACH,gGAAgG;QAChG,mGAAmG;QACnG,4FAA4F;QAC5F,wBAAwB;QACxB,MAAM,eAAe,GAAG,sBAAsB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC;YACH,OAAO,MAAM,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3D,CAAC;gBAAS,CAAC;YACT,eAAe,EAAE,CAAC;QACpB,CAAC;IACH,CAAC;YAAS,CAAC;QACT,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;AACH,CAAC;AAED;;;;;mEAKmE;AACnE,SAAS,kBAAkB,CAAC,MAAuB,EAAE,UAAkB;IACrE,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;IAC1B,IAAI,CAAC,KAAK,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC;QAAE,OAAO,SAAS,CAAC;IACnH,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;AACpC,CAAC;AAED;2BAC2B;AAC3B,SAAS,eAAe;IACtB,IAAI,CAAC;QACH,OAAO,aAAa,EAAE,KAAK,SAAS,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;2CAK2C;AAC3C,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,eAAe,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;0FAG0F;AAC1F,SAAS,uBAAuB;IAC9B,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,KAAK,EAAE,MAAM,KAAK,QAAQ,IAAI,sBAAsB,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAChF,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,IAAU,EAAE,UAAkB,EAAE,KAAa;IACxE,4FAA4F;IAC5F,kGAAkG;IAClG,kGAAkG;IAClG,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;QACvB,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,CAAC,GAAG,gDAAgD,CAAC,CAAC;IAC5G,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW;QAC5B,MAAM,IAAI,KAAK,CAAC,8CAA8C,KAAK,CAAC,IAAI,yDAAyD,CAAC,CAAC;IAErI,mGAAmG;IACnG,qGAAqG;IACrG,kGAAkG;IAClG,mGAAmG;IACnG,gGAAgG;IAChG,sGAAsG;IACtG,EAAE;IACF,qGAAqG;IACrG,oGAAoG;IACpG,sGAAsG;IACtG,EAAE;IACF,iGAAiG;IACjG,gGAAgG;IAChG,iGAAiG;IACjG,IAAI,eAAmC,CAAC;IACxC,IAAI,CAAC;QACH,eAAe,GAAG,SAAS,EAAE,EAAE,UAAU,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,eAAe,GAAG,SAAS,CAAC,CAAC,0DAA0D;IACzF,CAAC;IACD,IACE,IAAI,KAAK,OAAO;QAChB,IAAI,KAAK,OAAO;QAChB,eAAe,KAAK,SAAS;QAC7B,aAAa,CAAC,eAAe,CAAC;QAC9B,eAAe,CAAC,eAAe,EAAE,UAAU,CAAC,EAC5C,CAAC;QACD,MAAM,eAAe,GAAG,wBAAwB,EAAE,CAAC,IAAI,CACrD,CAAC,SAAS,EAAE,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,IAAI,CAAC,CACtE,CAAC;QACF,MAAM,QAAQ,GAAG,eAAe;YAC9B,CAAC,CAAC,oBAAoB,eAAe,CAAC,OAAO,kBAAkB,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;YACrG,CAAC,CAAC,qBAAqB,CAAC;QAC1B,MAAM,eAAe,GAAG,uBAAuB,CAAC,SAAS,EAAE,CAAC,CAAC;QAC7D,MAAM,IAAI,KAAK,CACb,cAAc,UAAU,8CAA8C,eAAe,GAAG,eAAe,KAAK;YAC1G,GAAG,QAAQ,uEAAuE,CACrF,CAAC;IACJ,CAAC;IAED,oGAAoG;IACpG,uGAAuG;IACvG,qGAAqG;IACrG,kGAAkG;IAClG,+FAA+F;IAC/F,gDAAgD;IAChD,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1C,CAAC,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;IACzE,CAAC;IAED,gGAAgG;IAChG,uGAAuG;IACvG,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,IAAI,KAAK,MAAM;YACjB,MAAM,IAAI,KAAK,CACb,uDAAuD,MAAM,CAAC,OAAO,YAAY,MAAM,CAAC,KAAK,qCAAqC,CACnI,CAAC;QACJ,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,iDAAiD,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC,CAAC;IAC9F,CAAC;IACD,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,MAAM,IAAI,eAAe,EAAE;QACjD,MAAM,IAAI,KAAK,CAAC,6EAA6E,CAAC,CAAC;IAEjG,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAEvD,qGAAqG;IACrG,qGAAqG;IACrG,kGAAkG;IAClG,iGAAiG;IACjG,IACE,IAAI,KAAK,MAAM;QACf,CAAC,MAAM;QACP,CAAC,eAAe,EAAE;QAClB,WAAW,EAAE;QACb,uBAAuB,EAAE;QACzB,SAAS,EAAE,EAAE,UAAU,KAAK,UAAU;QACtC,aAAa,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC;IAEd,MAAM,QAAQ,GAAG,SAAS,EAAE,EAAE,UAAU,CAAC;IACzC,MAAM,aAAa,GACjB,IAAI,KAAK,OAAO;QAChB,QAAQ,KAAK,SAAS;QACtB,aAAa,CAAC,QAAQ,CAAC;QACvB,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC;QACnC,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,YAAY,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,OAAO,CAAC;QAC3D,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YAC1B,gGAAgG;YAChG,+FAA+F;YAC/F,gFAAgF;YAChF,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACvC,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;aAAM,IAAI,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,CAAC,CAAC;YACvE,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,IAAI,KAAK,EAAE,CAAC;YACjB,+FAA+F;YAC/F,+FAA+F;YAC/F,+FAA+F;YAC/F,gGAAgG;YAChG,oEAAoE;YACpE,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC;YAC3C,MAAM,IAAI,GAAG,IAAI,KAAK,QAAQ,IAAI,QAAQ,IAAI,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YACnF,MAAM,aAAa,GAAG,QAAQ,IAAI,sBAAsB,CAAC,KAAK,CAAC,CAAC;YAChE,MAAM,OAAO,GAAG,IAAI,KAAK,OAAO,IAAI,IAAI,IAAI,aAAa,IAAI,CAAC,QAAQ,IAAI,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;YACjH,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;gBACvC,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAClC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;aAAM,IAAI,eAAe,IAAI,yBAAyB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACrF,+FAA+F;YAC/F,gGAAgG;YAChG,uFAAuF;YACvF,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;YACvC,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YAClC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,0EAA0E;QACpG,CAAC;IACH,CAAC;IAED,oGAAoG;IACpG,8FAA8F;IAC9F,sGAAsG;IACtG,4CAA4C;IAC5C,cAAc,CAAC,UAAU,CAAC,CAAC;IAC3B,aAAa,CAAC,UAAU,CAAC,CAAC;IAC1B,MAAM,cAAc,GAAG,UAAU,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IAC7D,IAAI,aAAa;QAAE,qBAAqB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACxE,WAAW,EAAE,CAAC;IACd,aAAa,EAAE,CAAC;IAChB,WAAW,CACT,UAAU,EACV,sBAAsB,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACvD,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AACzD,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAwB;IACvD,IAAI,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IACrD,OAAO,gBAAgB,KAAK,CAAC,SAAS,OAAO,KAAK,CAAC,SAAS,EAAE,CAAC;AACjE,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAY,EAAE,KAAY;IACvD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,oDAAoD,IAAI,OAAO,KAAK,CAAC,UAAU,gBAAgB,KAAK,CAAC,SAAS,OAAO,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,IAAI,CACzJ,CAAC;AACJ,CAAC;AAED;;;;;;0DAM0D;AAC1D,SAAS,uBAAuB,CAAC,IAAU;IACzC,sGAAsG;IACtG,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC;YACH,OAAO,YAAY,EAAE,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,0CAA0C;QACrG,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,IAAI,eAAe,GAAG,KAAK,EAAE,eAAe,IAAI,KAAK,CAAC;IACtD,IAAI,eAAe,GAAG,KAAK,EAAE,eAAe,IAAI,KAAK,CAAC;IAEtD,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE;QAC5B,IAAI,CAAC;YACH,sBAAsB,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE;QAC1B,IAAI,CAAC;YACH,UAAU,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,eAAe,GAAG,eAAe,IAAI,eAAe,CAAC;IACrD,eAAe,GAAG,eAAe,IAAI,aAAa,CAAC;IAEnD,qGAAqG;IACrG,wCAAwC;IACxC,IAAI,eAAe,IAAI,eAAe;QAAE,aAAa,CAAC,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC,CAAC;IAE7G,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,KAAK,GAAG,4BAA4B,EAAE,CAAC;QAC7C,IAAI,KAAK;YACP,OAAO,CAAC,KAAK,CACX,CAAC,CAAC,GAAG,CAAC,+CAA+C,KAAK,EAAE,CAAC;gBAC3D,CAAC,CAAC,GAAG,CAAC,2EAA2E,CAAC,CACrF,CAAC;IACN,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,yBAAyB,EAAE;QAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC,CAAC;IACtH,sGAAsG;IACtG,mGAAmG;IACnG,oGAAoG;IACpG,oGAAoG;IACpG,gDAAgD;IAChD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,SAAS,EAAE,CAAC;QAC1B,QAAQ,GAAG,KAAK,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,QAAQ,GAAG,IAAI,CAAC,CAAC,eAAe;IAClC,CAAC;IACD,IAAI,QAAQ,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;QACxC,MAAM,KAAK,GAAG,GAAG,SAAS,EAAE,YAAY,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACzE,UAAU,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;QAC/B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,0CAA0C,KAAK,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IACD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;QACrB,KAAK,MAAM,KAAK,IAAI,0BAA0B,EAAE;YAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC,CAAC;IACtH,CAAC;IACD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAC9C,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,IAAU,EAAE,UAAkB;IACvD,IAAI,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,yDAAyD;IAEjG,MAAM,OAAO,GAAG,WAAW,EAAE,CAAC;IAC9B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,8FAA8F;QAC9F,iGAAiG;QACjG,iFAAiF;QACjF,OAAO,IAAI,GAAG,CACZ,sBAAsB,EAAE;aACrB,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aAC/C,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CACnC,CAAC;IACJ,CAAC;IAED,kGAAkG;IAClG,oGAAoG;IACpG,8BAA8B;IAC9B,IAAI,MAA+B,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,GAAG,eAAe,EAAE,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,GAAG,SAAS,CAAC,CAAC,kCAAkC;IACxD,CAAC;IACD,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,mDAAmD;IACnD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,SAAS,GAAG,0BAA0B,EAAE,CAAC;QAC/C,IAAI,CAAC,SAAS;YACZ,MAAM,IAAI,KAAK,CACb,qMAAqM,CACtM,CAAC;QACJ,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,KAAK,CACb,mLAAmL,CACpL,CAAC;AACJ,CAAC;AAED;;0FAE0F;AAC1F,SAAS,OAAO,CAAC,IAAY,EAAE,UAAkB,EAAE,KAAa,EAAE,KAAc;IAC9E,mGAAmG;IACnG,mGAAmG;IACnG,kGAAkG;IAClG,mDAAmD;IACnD,EAAE;IACF,gGAAgG;IAChG,sGAAsG;IACtG,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,EAAE,CAAC;IAClC,WAAW,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAChE,WAAW,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACpD,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAC/B,MAAM,CAAC,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,EAAE;QAC3D,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,wBAAwB,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;KACjG,CAAC,CAAC;IACH,gBAAgB,EAAE,CAAC,CAAC,kFAAkF;IACtG,IAAI,CAAC,CAAC,MAAM;QAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzE,MAAM,IAAI,KAAK,CAAC,6BAA6B,IAAI,UAAU,SAAS,MAAM,IAAI,EAAE,CAAC,CAAC;IACpF,CAAC;AACH,CAAC;AAED;;;uGAGuG;AACvG,SAAS,eAAe,CAAC,IAAY,EAAE,UAAkB;IACvD,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;IACxC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,MAAM,GAAG,gGAAgG,CAAC,CAAC;IACzJ,MAAM,OAAO,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC;IAC/C,IAAI,CAAC,OAAO;QACV,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,MAAM,GAAG,6EAA6E,CAAC,CAAC;IAC5H,IAAI,OAAO,KAAK,UAAU;QACxB,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,MAAM,GAAG,0BAA0B,OAAO,+BAA+B,UAAU,iEAAiE,CAAC,CAAC;IAC1L,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,MAAM,GAAG,mGAAmG,CAAC,CAAC;AACpJ,CAAC;AAED;uGACuG;AACvG,SAAS,gBAAgB,CAAC,GAAW;IACnC,MAAM,GAAG,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,IAAI,GAAG,UAAU,CAAC;IACtB,IAAI,CAAC;QACH,MAAM,QAAQ,GAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAuB,CAAC,IAAI,CAAC;QACzG,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ;YAAE,IAAI,GAAG,QAAQ,CAAC;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC,CAAC,uCAAuC;IACvD,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;AACrC,CAAC;AAED;iFACiF;AACjF,SAAS,QAAQ,CAAC,IAAY;IAC5B,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;IACxC,OAAO,yBAAyB,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC;IACxC,OAAO,sBAAsB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW;IACpC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AAC3E,CAAC;AAED;;4EAE4E;AAC5E,SAAS,eAAe,CAAC,CAAS,EAAE,CAAqB;IACvD,OAAO,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,CAAS,EAAE,CAAS;IAChD,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1B,MAAM,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IACD,4EAA4E;IAC5E,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC;IAC9C,IAAI,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,6CAA6C;QAC7E,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3B,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC;gBAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC;aAAM,IAAI,EAAE;YAAE,OAAO,CAAC,CAAC,CAAC,CAAC,8CAA8C;aACnE,IAAI,EAAE;YAAE,OAAO,CAAC,CAAC;aACjB,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
|
package/dist/ui.d.ts
CHANGED
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
import type { PresenceStatus } from "@cotal-ai/core";
|
|
2
2
|
export { c, color256 } from "@cotal-ai/workspace";
|
|
3
3
|
export declare function statusBadge(status: PresenceStatus): string;
|
|
4
|
+
/** Compact age: `12s`, `47m`, `3h`, `2d`. */
|
|
5
|
+
export declare function fmtAge(ms: number): string;
|
|
6
|
+
/** The facts a status word needs beside it (#618): the harness-reported condition and how long it has
|
|
7
|
+
* held, then the age of the seat's last harness-reported work event (`activeAt`). A failure 3s old
|
|
8
|
+
* and one 40m old, or a turn that stopped advancing and one that is advancing, no longer render
|
|
9
|
+
* alike. The seat reports `activeAt` itself, so the status word keeps its own progress wording. */
|
|
10
|
+
export declare function presenceDetail(p: {
|
|
11
|
+
condition?: {
|
|
12
|
+
code: string;
|
|
13
|
+
since?: number;
|
|
14
|
+
};
|
|
15
|
+
activeAt?: number;
|
|
16
|
+
}, now?: number): string;
|
|
4
17
|
/** A follow-up hint for failures whose signature is stale on-disk broker state: streams/durable
|
|
5
18
|
* consumers minted by an older, incompatible Cotal generation survive every down/up cycle, and
|
|
6
19
|
* JetStream rejects a same-name re-create with a different config. Rendered dim under the red
|
package/dist/ui.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../src/ui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKrD,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAElD,wBAAgB,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAW1D;AAED;;;qFAGqF;AACrF,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO9D"}
|
|
1
|
+
{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../src/ui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAKrD,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAElD,wBAAgB,WAAW,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAW1D;AAED,6CAA6C;AAC7C,wBAAgB,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAMzC;AAED;;;oGAGoG;AACpG,wBAAgB,cAAc,CAAC,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,SAAa,GAAG,MAAM,CAK/H;AAED;;;qFAGqF;AACrF,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAO9D"}
|
package/dist/ui.js
CHANGED
|
@@ -14,6 +14,27 @@ export function statusBadge(status) {
|
|
|
14
14
|
return c.dim("⨯ offline");
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
+
/** Compact age: `12s`, `47m`, `3h`, `2d`. */
|
|
18
|
+
export function fmtAge(ms) {
|
|
19
|
+
const s = Math.max(0, Math.floor(ms / 1000));
|
|
20
|
+
if (s < 60)
|
|
21
|
+
return `${s}s`;
|
|
22
|
+
if (s < 3600)
|
|
23
|
+
return `${Math.floor(s / 60)}m`;
|
|
24
|
+
if (s < 86_400)
|
|
25
|
+
return `${Math.floor(s / 3600)}h`;
|
|
26
|
+
return `${Math.floor(s / 86_400)}d`;
|
|
27
|
+
}
|
|
28
|
+
/** The facts a status word needs beside it (#618): the harness-reported condition and how long it has
|
|
29
|
+
* held, then the age of the seat's last harness-reported work event (`activeAt`). A failure 3s old
|
|
30
|
+
* and one 40m old, or a turn that stopped advancing and one that is advancing, no longer render
|
|
31
|
+
* alike. The seat reports `activeAt` itself, so the status word keeps its own progress wording. */
|
|
32
|
+
export function presenceDetail(p, now = Date.now()) {
|
|
33
|
+
const since = p.condition?.since;
|
|
34
|
+
const condition = p.condition ? ` (${p.condition.code}${since === undefined ? "" : ` for ${fmtAge(now - since)}`})` : "";
|
|
35
|
+
const active = p.activeAt === undefined ? "" : c.dim(` · active ${fmtAge(now - p.activeAt)} ago`);
|
|
36
|
+
return condition + active;
|
|
37
|
+
}
|
|
17
38
|
/** A follow-up hint for failures whose signature is stale on-disk broker state: streams/durable
|
|
18
39
|
* consumers minted by an older, incompatible Cotal generation survive every down/up cycle, and
|
|
19
40
|
* JetStream rejects a same-name re-create with a different config. Rendered dim under the red
|
package/dist/ui.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui.js","sourceRoot":"","sources":["../src/ui.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AAExC,0FAA0F;AAC1F,yEAAyE;AACzE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,UAAU,WAAW,CAAC,MAAsB;IAChD,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/B,KAAK,MAAM;YACT,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1B,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED;;;qFAGqF;AACrF,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,+FAA+F;IAC/F,8FAA8F;IAC9F,2EAA2E;IAC3E,OAAO,gDAAgD,CAAC,IAAI,CAAC,GAAG,CAAC;QAC/D,CAAC,CAAC,mLAAmL;QACrL,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
|
|
1
|
+
{"version":3,"file":"ui.js","sourceRoot":"","sources":["../src/ui.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAC;AAExC,0FAA0F;AAC1F,yEAAyE;AACzE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAElD,MAAM,UAAU,WAAW,CAAC,MAAsB;IAChD,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;QACjD,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC/B,KAAK,MAAM;YACT,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1B,KAAK,SAAS;YACZ,OAAO,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,MAAM,CAAC,EAAU;IAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC;IAC3B,IAAI,CAAC,GAAG,IAAI;QAAE,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC;IAC9C,IAAI,CAAC,GAAG,MAAM;QAAE,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;IAClD,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC;AACtC,CAAC;AAED;;;oGAGoG;AACpG,MAAM,UAAU,cAAc,CAAC,CAAsE,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;IACrH,MAAM,KAAK,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC;IACjC,MAAM,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,MAAM,CAAC,GAAG,GAAG,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IACzH,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClG,OAAO,SAAS,GAAG,MAAM,CAAC;AAC5B,CAAC;AAED;;;qFAGqF;AACrF,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,+FAA+F;IAC/F,8FAA8F;IAC9F,2EAA2E;IAC3E,OAAO,gDAAgD,CAAC,IAAI,CAAC,GAAG,CAAC;QAC/D,CAAC,CAAC,mLAAmL;QACrL,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cotal-ai/cli",
|
|
3
3
|
"description": "Cotal mesh CLI: up, join, watch, console, spawn, mint, channels, history, ext.",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.59.0",
|
|
5
5
|
"homepage": "https://cotal.ai",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"repository": {
|
|
@@ -19,6 +19,8 @@
|
|
|
19
19
|
}
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
+
"@cotal-ai/core": "0.59.0",
|
|
23
|
+
"@cotal-ai/workspace": "0.59.0",
|
|
22
24
|
"@nats-io/jetstream": "^3.4.0",
|
|
23
25
|
"@nats-io/kv": "^3.4.0",
|
|
24
26
|
"@nats-io/obj": "^3.4.0",
|
|
@@ -28,9 +30,7 @@
|
|
|
28
30
|
"react": "^19.0.0",
|
|
29
31
|
"yaml": "^2.9.0",
|
|
30
32
|
"zod": "^4.4.3",
|
|
31
|
-
"ws": "^8.21.0"
|
|
32
|
-
"@cotal-ai/core": "0.57.0",
|
|
33
|
-
"@cotal-ai/workspace": "0.57.0"
|
|
33
|
+
"ws": "^8.21.0"
|
|
34
34
|
},
|
|
35
35
|
"optionalDependencies": {
|
|
36
36
|
"@eplightning/nats-server-darwin-arm64": "^2.14.0",
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
"@eplightning/nats-server-win32-x64": "^2.14.0"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
+
"@cotal-ai/auth": "0.59.0",
|
|
45
|
+
"@cotal-ai/smoke-kit": "0.0.0",
|
|
44
46
|
"@types/react": "^19.0.0",
|
|
45
|
-
"@types/ws": "^8.18.1"
|
|
46
|
-
"@cotal-ai/auth": "0.57.0",
|
|
47
|
-
"@cotal-ai/smoke-kit": "0.0.0"
|
|
47
|
+
"@types/ws": "^8.18.1"
|
|
48
48
|
},
|
|
49
49
|
"files": [
|
|
50
50
|
"dist",
|