@iowarp/clio-coder 0.4.1 → 0.4.3

package/src/cli/skills.ts

@@ -6,6 +6,7 @@ import {
 	type MarketplaceSkill,
 	modelVisibleSkills,
 	type ResourceDiagnostic,
+	resolveMarketplaceShaping,
 	type Skill,
 	type SkillUpdateReport,
 	skillCatalogValidity,
@@ -444,7 +445,11 @@ export async function runSkillsCommand(argv: ReadonlyArray<string>): Promise<num
 				return 2;
 			}
 			try {
-				const reports = updateSkills(name ? { name, force: parsed.force } : { all: true, force: parsed.force });
+				const reports = updateSkills({
+					...(name ? { name } : { all: true }),
+					force: parsed.force,
+					resolveShaping: resolveMarketplaceShaping(),
+				});
 				return printUpdateReports(reports);
 			} catch (err) {
 				printError(err instanceof Error ? err.message : String(err));
@@ -453,7 +458,9 @@ export async function runSkillsCommand(argv: ReadonlyArray<string>): Promise<num
 		}
 		case "sync": {
 			try {
-				return printUpdateReports(updateSkills({ all: true, force: parsed.force }));
+				return printUpdateReports(
+					updateSkills({ all: true, force: parsed.force, resolveShaping: resolveMarketplaceShaping() }),
+				);
 			} catch (err) {
 				printError(err instanceof Error ? err.message : String(err));
 				return 1;

package/src/cli/targets.ts

@@ -51,10 +51,6 @@ Usage:
   clio-coder targets convert <id> --runtime <runtimeId>
   clio-coder targets remove <id>
   clio-coder targets rename <old> <new>
-
-Aliases:
-  --worker-target and --worker-model are accepted for --fleet-target and
-  --fleet-model, carried over from before the worker/fleet rename.
 `;
 
 const USE_USAGE =
@@ -249,11 +245,11 @@ function parseUseArgs(args: ReadonlyArray<string>): UseArgs | null {
 			parsed.backgroundModel = need();
 			continue;
 		}
-		if (arg === "--fleet-model" || arg === "--worker-model") {
+		if (arg === "--fleet-model") {
 			parsed.workerModel = need();
 			continue;
 		}
-		if (arg === "--fleet-target" || arg === "--worker-target") {
+		if (arg === "--fleet-target") {
 			parsed.workerTarget = need();
 			continue;
 		}
@@ -1007,6 +1003,7 @@ function formatUrl(status: TargetStatus): string {
 
 function formatAuth(providers: ProvidersContract, status: TargetStatus): string {
 	if (!status.runtime) return "-";
+	if (status.runtime.externalAgentLoop !== undefined) return "operator session";
 	if (status.runtime.auth !== "api-key" && status.runtime.auth !== "oauth") return status.runtime.auth;
 	const auth = providers.auth.statusForTarget(status.target, status.runtime);
 	if (!auth.available) return "disconnected";
@@ -1142,6 +1139,7 @@ interface SerializedStatus {
 	probeNotes?: TargetStatus["probeNotes"];
 	probeSurfaces?: TargetStatus["probeSurfaces"];
 	discoveredModels: TargetStatus["discoveredModels"];
+	discoveredModelLabels?: TargetStatus["discoveredModelLabels"];
 	discoveredModelsSource?: TargetStatus["discoveredModelsSource"];
 	discoveredModelStates?: TargetStatus["discoveredModelStates"];
 	tier: ProviderOutputTier;
@@ -1169,6 +1167,7 @@ function serializeStatus(
 		detectedReasoning: extras.detectedReasoning,
 		reasoningCandidateModelId: extras.candidateModelId,
 	};
+	if (status.discoveredModelLabels !== undefined) out.discoveredModelLabels = status.discoveredModelLabels;
 	const endpointCapacity = endpointCapacityForStatus(status);
 	if (endpointCapacity !== null) out.endpointCapacity = endpointCapacity;
 	if (status.contextWindowProvenance !== undefined) {

package/src/cli/trace.ts

@@ -3,6 +3,8 @@ import { access } from "node:fs/promises";
 import { resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { clioStatePath } from "../core/xdg.js";
+import type { CodeStepRecord } from "../domains/dispatch/code-step.js";
+import { codeStepDir, readCodeStepRecords } from "../domains/dispatch/code-step-store.js";
 import {
 	assertTraceSelectOnly,
 	DEFAULT_TRACE_RETENTION_POLICY,
@@ -24,12 +26,16 @@ const HELP = `Usage:
   clio-coder trace phases <runId> [--db PATH]
   clio-coder trace tail <runId> [--follow] [--db PATH]
   clio-coder trace procs <runId> [--db PATH]
+  clio-coder trace code-steps <rootId> [--json]   deterministic code steps of one fleet root
   clio-coder trace prune [--max-age-days N] [--max-bytes N] [--db PATH] [--json]
   clio-coder trace sql <SELECT query> [--db PATH]
   clio-coder trace ui [--db PATH] [--port N]        source checkout only
 
 The viewer ships with the repository, not the npm package, so from an installed
-Clio the subcommands above are the way in. They read the same database.
+Clio the subcommands above are the way in. They read the same database, except
+code-steps, which reads the per-root record files under the state directory's
+code-steps/ tree (a code step is a subprocess, not a model run, so it never
+enters the SQLite mirror).
 Pruning keeps ${DEFAULT_TRACE_RETENTION_POLICY.maxAgeDays} days and at most ${DEFAULT_TRACE_RETENTION_POLICY.maxBytes} bytes by default. Set
 CLIO_CODER_TRACE_RETENTION_DAYS or CLIO_CODER_TRACE_MAX_BYTES to change the automatic
 policy; prune flags override those values for one command.
@@ -97,7 +103,7 @@ function parseTraceArgs(args: string[]): ParsedTraceArgs {
 }
 
 /** Every subcommand `trace` answers to. Anything else is a usage error. */
-const TRACE_COMMANDS = new Set(["runs", "inspect", "phases", "tail", "procs", "prune", "sql", "ui"]);
+const TRACE_COMMANDS = new Set(["runs", "inspect", "phases", "tail", "procs", "code-steps", "prune", "sql", "ui"]);
 
 /** The subcommands whose first positional is a run id. */
 const TRACE_COMMANDS_NEEDING_RUN_ID = new Set(["phases", "tail", "procs"]);
@@ -119,6 +125,10 @@ function invocationError(command: string, runId: string | undefined): number | n
 		return 2;
 	}
 	if (TRACE_COMMANDS_NEEDING_RUN_ID.has(command) && !runId) return missingRunId(command);
+	if (command === "code-steps" && !runId) {
+		process.stderr.write("trace code-steps requires a fleet root id\n");
+		return 2;
+	}
 	return null;
 }
 
@@ -161,6 +171,12 @@ export async function runTraceCommand(args: string[]): Promise<number> {
 
 	if (command === "ui") return runTraceUi(parsed.db, parsed.port);
 
+	// Code-step records live in flat per-root JSON files beside the ledger, not
+	// in the SQLite mirror, so this answers before the database is consulted and
+	// ignores --db. An absent root directory is the empty state: the root either
+	// never ran a code step or its records were pruned with the state tree.
+	if (command === "code-steps") return runTraceCodeSteps(runId ?? "", parsed.json);
+
 	// `inspect` answers ahead of the no-database courtesy below, because its
 	// answer to a state tree nothing has written to is a JSON snapshot saying
 	// the trace database is unavailable, not a sentence on stdout.
@@ -242,6 +258,41 @@ export async function runTraceCommand(args: string[]): Promise<number> {
 	}
 }
 
+/**
+ * Print every `CodeStepRecord` one fleet root wrote, oldest first. The record
+ * is the code step's stand-in for a receipt (argv, cwd, env names, exit code,
+ * duration, output digest, artifact paths), and until this command nothing
+ * read it back. JSON is the record verbatim; the table keeps the fields an
+ * operator scans for and leaves argv last because it is the widest.
+ */
+function runTraceCodeSteps(rootId: string, json: boolean): number {
+	let records: CodeStepRecord[];
+	try {
+		records = readCodeStepRecords(rootId);
+	} catch (error) {
+		process.stderr.write(`code-step records: ${error instanceof Error ? error.message : String(error)}\n`);
+		return 1;
+	}
+	if (json) {
+		process.stdout.write(`${JSON.stringify(records, null, 2)}\n`);
+		return 0;
+	}
+	if (records.length === 0) {
+		process.stdout.write(
+			`no code-step records for fleet root ${rootId} under ${codeStepDir(rootId)}. a record is written when a fleet plan runs a deterministic code step.\n`,
+		);
+		return 0;
+	}
+	process.stdout.write("EXIT  DURATION STARTED                  STEP                 COMMAND              ARGV\n");
+	for (const record of records) {
+		const exit = record.timedOut ? "timeout" : record.signal !== null ? `sig:${record.signal}` : String(record.exitCode);
+		process.stdout.write(
+			`${exit.padEnd(5)} ${`${record.durationMs}ms`.padStart(8)} ${record.startedAt.padEnd(24)} ${record.stepId.slice(0, 20).padEnd(20)} ${record.commandId.slice(0, 20).padEnd(20)} ${record.argv.join(" ")}\n`,
+		);
+	}
+	return 0;
+}
+
 function runTracePrune(parsed: ParsedTraceArgs): number {
 	let policy: ReturnType<typeof resolveTraceRetentionPolicy>;
 	try {
@@ -302,10 +353,10 @@ function formatEvent(row: TraceEventRow): string {
 }
 
 function printRuns(rows: TraceRunRow[]): void {
-	process.stdout.write("STATUS   STARTED                      TOKENS       COST RUN\n");
+	process.stdout.write("STATUS   SOURCE   STARTED                      TOKENS       COST RUN\n");
 	for (const row of rows) {
 		process.stdout.write(
-			`${row.status.padEnd(8)} ${row.started_at.padEnd(28)} ${formatNumber(row.total_tokens).padStart(8)} ${formatCost(row.total_cost_usd).padStart(10)} ${row.run_id}\n`,
+			`${row.status.padEnd(8)} ${row.source.padEnd(8)} ${row.started_at.padEnd(28)} ${formatNumber(row.total_tokens).padStart(8)} ${formatCost(row.total_cost_usd).padStart(10)} ${row.run_id}\n`,
 		);
 	}
 }