@skrr-ai/cli 0.1.108 → 0.1.110

package/dist/commands/triggers/fire.js

@@ -46,9 +46,17 @@ class TriggersFire extends base_command_1.BaseCommand {
         }
         const accepted = (0, triggers_1.fireWasAccepted)(result);
         if (flags.json) {
-            this.log(JSON.stringify(result, null, 2));
-            if (flags.strict && !accepted)
+            // `ok` and the exit status are one answer: a strict refusal prints `ok: false` and why,
+            // never the server's transport-level `ok: true` beside exit 1 (OSK-16494).
+            const refused = flags.strict && !accepted;
+            this.log(JSON.stringify(refused
+                ? { ...result, ok: false, strictRefusal: (0, triggers_1.describeStrictFireRefusal)(result) }
+                : result, null, 2));
+            if (refused) {
+                // stdout stays the one JSON document; the reason goes to stderr.
+                process.stderr.write(`${(0, triggers_1.describeStrictFireRefusal)(result)}\n`);
                 this.exit(1);
+            }
             return;
         }
         this.log(`Fire requested: outcome=${String(result.outcome ?? '-')} reason=${String(result.reason ?? '-')}`);
@@ -57,8 +65,10 @@ class TriggersFire extends base_command_1.BaseCommand {
         const note = (0, triggers_1.describeScheduledFire)(result);
         if (note)
             this.log(note);
-        if (flags.strict && !accepted)
+        if (flags.strict && !accepted) {
+            process.stderr.write(`${(0, triggers_1.describeStrictFireRefusal)(result)}\n`);
             this.exit(1);
+        }
     }
 }
 exports.default = TriggersFire;

package/dist/commands/triggers/parse-intent.d.ts

@@ -1,4 +1,5 @@
 import { BaseCommand } from '../../base-command';
+import { type TriggerParseIntentResponse } from '../../lib/triggers';
 export default class TriggersParseIntent extends BaseCommand {
     static description: string;
     static examples: string[];
@@ -14,3 +15,9 @@ export default class TriggersParseIntent extends BaseCommand {
     };
     run(): Promise<void>;
 }
+/**
+ * The human rendering of a parse. Every unsupported condition is printed on its own line, never
+ * folded into the proposal (OSK-15402: "skip market holidays" was dropped while the summary claimed
+ * "every NYSE trading day"), and a clarifying question names the supported way to answer it.
+ */
+export declare function parseIntentLines(result: TriggerParseIntentResponse, bin?: string): string[];

package/dist/commands/triggers/parse-intent.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseIntentLines = parseIntentLines;
 const core_1 = require("@oclif/core");
 const base_command_1 = require("../../base-command");
 const prompt_1 = require("../../lib/prompt");
@@ -21,11 +22,11 @@ class TriggersParseIntent extends base_command_1.BaseCommand {
             multiple: true,
         }),
         message: core_1.Flags.string({
-            description: 'User message to parse (repeatable; messages are appended as user turns)',
+            description: 'User message to parse (repeatable; appended as user turns, after --history-json when both are given)',
             multiple: true,
         }),
         'history-json': core_1.Flags.string({
-            description: 'Full parser history JSON array of {role:"user"|"assistant",content:string} objects',
+            description: 'Parser history: an inline JSON array of {role:"user"|"assistant",content:string} objects, or @file / a path to a file holding it. To answer a clarifying question, pass the `history` a previous --json run returned and add your reply with --message',
         }),
         timezone: core_1.Flags.string({ description: 'IANA timezone used for relative times' }),
         now: core_1.Flags.string({ description: 'Override current ISO timestamp used for relative times' }),
@@ -51,7 +52,10 @@ class TriggersParseIntent extends base_command_1.BaseCommand {
             if (history)
                 body.history = history;
             if (flags.message && flags.message.length > 0) {
-                body.history = flags.message.map((content) => ({ role: 'user', content }));
+                // Appended, never replacing: a reply to a clarifying question only means something after
+                // the question it answers (OSK-15402). It used to discard --history-json entirely.
+                const prior = Array.isArray(body.history) ? body.history : [];
+                body.history = [...prior, ...flags.message.map((content) => ({ role: 'user', content }))];
             }
             if (flags.timezone)
                 body.timezone = flags.timezone;
@@ -83,12 +87,30 @@ class TriggersParseIntent extends base_command_1.BaseCommand {
             this.log(JSON.stringify(result, null, 2));
             return;
         }
-        this.log(result.message ?? '(no parser message)');
-        this.log(`Needs clarification: ${result.needsClarification ? 'yes' : 'no'}`);
-        if (result.proposedTrigger) {
-            this.log('');
-            this.log(JSON.stringify(result.proposedTrigger, null, 2));
-        }
+        for (const line of parseIntentLines(result, this.config.bin))
+            this.log(line);
     }
 }
 exports.default = TriggersParseIntent;
+/**
+ * The human rendering of a parse. Every unsupported condition is printed on its own line, never
+ * folded into the proposal (OSK-15402: "skip market holidays" was dropped while the summary claimed
+ * "every NYSE trading day"), and a clarifying question names the supported way to answer it.
+ */
+function parseIntentLines(result, bin = 'skrr') {
+    const lines = [result.message ?? '(no parser message)'];
+    lines.push(`Needs clarification: ${result.needsClarification ? 'yes' : 'no'}`);
+    const unsupported = Array.isArray(result.unsupported) ? result.unsupported : [];
+    if (unsupported.length > 0) {
+        lines.push('', 'Not applied by this trigger:');
+        for (const item of unsupported)
+            lines.push(`  - "${item.text}" (${item.kind}): ${item.reason}`);
+    }
+    if (result.proposedTrigger) {
+        lines.push('', JSON.stringify(result.proposedTrigger, null, 2));
+    }
+    else if (result.needsClarification) {
+        lines.push('', 'To answer, run it again with your reply after the earlier messages, e.g.', `  ${bin} triggers parse-intent --scope <kind> --ref <key=value> --message "<first message>" --message "<your answer>"`, 'or pass the returned `history` (see --json) with --history-json and add --message "<your answer>".');
+    }
+    return lines;
+}

package/dist/commands/triggers/update.js

@@ -56,7 +56,7 @@ class TriggersUpdate extends base_command_1.BaseCommand {
             description: 'ISO-8601 datetime after which a schedule stops firing',
         }),
         'stale-catchup-ms': core_1.Flags.integer({
-            description: 'How late a missed occurrence may still run, in ms (a positive number). After downtime, an occurrence more than this overdue is skipped rather than run late, and the schedule moves to its next future slot. Unset: 3600000 (1 hour).',
+            description: 'How late a missed occurrence may still run, in ms, from 1000 (1 second) to 31622400000 (366 days). After downtime, an occurrence more than this overdue is skipped rather than run late, and the schedule moves to its next future slot. Unset: 3600000 (1 hour).',
         }),
         at: core_1.Flags.string({ description: 'ISO-8601 datetime for once triggers' }),
         entity: core_1.Flags.string({

package/dist/commands/workspaces/grants.js

@@ -18,10 +18,11 @@ class WorkspacesGrants extends base_command_1.BaseCommand {
         const { args, flags } = await this.parse(WorkspacesGrants);
         try {
             const report = await (0, workspaces_1.listWorkspaceGrants)(args.workspaceId);
-            if (flags.json)
+            if (flags.json) {
                 this.log(JSON.stringify(report, null, 2));
-            else
-                (0, stewardship_output_1.printWorkspaceGrants)(report, (line) => this.log(line));
+                return;
+            }
+            (0, stewardship_output_1.printWorkspaceGrants)(report, (line) => this.log(line), await memberNames(args.workspaceId));
         }
         catch (error) {
             this.handleApiError(error);
@@ -29,3 +30,19 @@ class WorkspacesGrants extends base_command_1.BaseCommand {
     }
 }
 exports.default = WorkspacesGrants;
+/**
+ * Owner ids to names, for the table's OWNER column (OSK-15357). Best effort: the
+ * report is already authoritative, and a members read that fails only leaves
+ * the column showing ids, as it did before.
+ */
+async function memberNames(workspaceId) {
+    try {
+        const members = await (0, workspaces_1.listWorkspaceMembers)(workspaceId);
+        return new Map(members
+            .map((member) => [member.userId, member.name ?? member.email ?? ''])
+            .filter(([, name]) => name));
+    }
+    catch {
+        return new Map();
+    }
+}

package/dist/commands/workspaces/members.d.ts

@@ -0,0 +1,20 @@
+import { BaseCommand } from '../../base-command';
+/**
+ * `skrr workspaces members` — who is in a workspace, with the user id the
+ * other workspace commands take (OSK-15356).
+ *
+ * `workspaces stewardship` needs a member's user id, and nothing in this
+ * command family printed one but `skrr whoami` (your own). An owner handing
+ * over a departing member's work had no way to find theirs.
+ */
+export default class WorkspacesMembers extends BaseCommand {
+    static description: string;
+    static examples: string[];
+    static args: {
+        workspaceId: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    run(): Promise<void>;
+}

package/dist/commands/workspaces/members.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
+const base_command_1 = require("../../base-command");
+const format_1 = require("../../lib/format");
+const workspaces_1 = require("../../lib/workspaces");
+/**
+ * `skrr workspaces members` — who is in a workspace, with the user id the
+ * other workspace commands take (OSK-15356).
+ *
+ * `workspaces stewardship` needs a member's user id, and nothing in this
+ * command family printed one but `skrr whoami` (your own). An owner handing
+ * over a departing member's work had no way to find theirs.
+ */
+class WorkspacesMembers extends base_command_1.BaseCommand {
+    static description = 'List the current members of a workspace with their user ids and roles';
+    static examples = [
+        '<%= config.bin %> workspaces members <workspace-id>',
+        '<%= config.bin %> workspaces members <workspace-id> --json',
+    ];
+    static args = {
+        workspaceId: core_1.Args.string({ required: true, ignoreStdin: true, description: 'Workspace ID' }),
+    };
+    static flags = {
+        json: core_1.Flags.boolean({ description: 'Output as JSON' }),
+    };
+    async run() {
+        this.requireAuth();
+        const { args, flags } = await this.parse(WorkspacesMembers);
+        let members;
+        try {
+            members = await (0, workspaces_1.listWorkspaceMembers)(args.workspaceId);
+        }
+        catch (error) {
+            this.handleApiError(error);
+            return;
+        }
+        if (flags.json) {
+            this.printJsonResult(members);
+            return;
+        }
+        if (members.length === 0) {
+            this.log('No current members.');
+            return;
+        }
+        (0, format_1.renderTable)(members.map((member) => ({
+            userId: member.userId,
+            name: member.name ?? '—',
+            email: member.email ?? '—',
+            role: member.role ?? '—',
+            joined: member.joinedAt ?? '—',
+        })), [
+            { key: 'userId', header: 'USER ID', verbatim: true },
+            { key: 'name', header: 'NAME', maxWidth: 28 },
+            { key: 'email', header: 'EMAIL', maxWidth: 36 },
+            { key: 'role', header: 'ROLE' },
+            { key: 'joined', header: 'JOINED' },
+        ], (line) => this.log(line));
+        this.log('');
+        this.log('Current members only: someone who has left is not listed. ' +
+            `\`skrr workspaces stewardship ${args.workspaceId} <user-id|email>\` reads one member's handover.`);
+    }
+}
+exports.default = WorkspacesMembers;

package/dist/commands/workspaces/stewardship.js

@@ -8,13 +8,15 @@ class WorkspacesStewardship extends base_command_1.BaseCommand {
     static description = 'Read a member’s workspace stewardship metadata (person owner/admin only)';
     static examples = [
         '<%= config.bin %> workspaces stewardship <workspace-id> <user-id> --json',
+        '<%= config.bin %> workspaces stewardship <workspace-id> person@example.com',
     ];
     static args = {
         workspaceId: core_1.Args.string({ required: true, ignoreStdin: true, description: 'Workspace ID' }),
         userId: core_1.Args.string({
             required: true,
             ignoreStdin: true,
-            description: 'Member user ID: 24 hexadecimal characters, not an email (`skrr whoami` prints your own)',
+            description: "Member user ID (24 hexadecimal characters) or a current member's email. " +
+                '`skrr workspaces members <workspace-id>` lists them; `skrr whoami` prints your own',
         }),
     };
     static flags = {
@@ -23,8 +25,18 @@ class WorkspacesStewardship extends base_command_1.BaseCommand {
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(WorkspacesStewardship);
+        let userId;
         try {
-            const report = await (0, workspaces_1.getWorkspaceStewardship)(args.workspaceId, args.userId);
+            userId = await (0, workspaces_1.resolveMemberUserId)(args.workspaceId, args.userId);
+        }
+        catch (error) {
+            if (error instanceof workspaces_1.MemberReferenceError)
+                this.error(error.message, { exit: 1 });
+            this.handleApiError(error);
+            return;
+        }
+        try {
+            const report = await (0, workspaces_1.getWorkspaceStewardship)(args.workspaceId, userId);
             if (flags.json)
                 this.log(JSON.stringify(report, null, 2));
             else

package/dist/help.js

@@ -61,6 +61,18 @@ class SkrrHelp extends core_1.Help {
         // so it must fall through — only an id that is neither a command nor a
         // topic is a miss.
         if (id && !this.config.findCommand(id) && !this.config.findTopic(id)) {
+            // `skrr tasks get --help` is asked about the command `skrr tasks get` runs
+            // as: the same synonym the hook resolves when it is run (OSK-16434).
+            const flagStart = argv.findIndex((token) => token.startsWith('-'));
+            const words = flagStart === -1 ? argv : argv.slice(0, flagStart);
+            const synonym = (0, command_miss_1.resolveVerbSynonym)(lookup, words);
+            if (synonym) {
+                return super.showHelp([
+                    ...synonym.id.split(':'),
+                    ...synonym.rest,
+                    ...(flagStart === -1 ? [] : argv.slice(flagStart)),
+                ]);
+            }
             throw new Error((0, command_miss_1.describeCommandMiss)(lookup, id));
         }
         return super.showHelp(argv);

package/dist/hooks/command-not-found.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@oclif/core");
 const command_manifest_1 = require("../lib/command-manifest");
 const usage_discovery_1 = require("../lib/usage-discovery");
 const command_miss_1 = require("../lib/command-miss");
+const json_mode_1 = require("../lib/json-mode");
 /**
  * Turn "command not found" back into the truth when the command DOES exist.
  *
@@ -65,6 +67,30 @@ const hook = async function (opts) {
                 throw err;
         }
     }
+    const lookup = (0, command_miss_1.lookupFromConfig)(this.config);
+    const rawArgv = process.argv.slice(2);
+    const words = (0, command_miss_1.typedCommandWords)(id, rawArgv);
+    // A read verb spelled the other way (`tasks get`, `machines ls`) means the
+    // command that exists. Run it rather than refuse: refusing sent a reader to a
+    // suggestion list that did not contain the command they meant (OSK-16434).
+    // Only `list`/`ls` and `show`/`get`, only when the typed spelling is not a
+    // command of that topic, and only when the other one is.
+    const synonym = (0, command_miss_1.resolveVerbSynonym)(lookup, words);
+    if (synonym) {
+        // Said to a person, never to a pipe: a script gets its output undisturbed.
+        if (process.stderr.isTTY && !(0, json_mode_1.wantsJsonFromArgv)(rawArgv)) {
+            process.stderr.write(`\`${synonym.typed}\` is \`${synonym.resolved}\`.\n`);
+        }
+        return this.config.runCommand(synonym.id, [...synonym.rest, ...(opts.argv ?? [])]);
+    }
+    // `--json` asked for a document. A miss is a refusal like any other, and every
+    // other refusal prints `{ok:false, error}`; this one printed prose, so the
+    // pipe into `jq` failed on the prose and hid the refusal (OSK-16434). Exit
+    // status 1, as before.
+    if ((0, json_mode_1.wantsJsonFromArgv)([...rawArgv, ...(opts.argv ?? [])])) {
+        process.stdout.write(`${JSON.stringify((0, command_miss_1.commandMissEnvelope)(lookup, id, words), null, 2)}\n`);
+        core_1.Errors.exit(1);
+    }
     // The message itself lives in `lib/command-miss`, shared with the help
     // class — `skrr daemon reload` reaches this hook and `skrr daemon reload
     // --help` does not, so the two surfaces have to read from one description or
@@ -76,7 +102,7 @@ const hook = async function (opts) {
     // — a typo would silently look like success, which is far worse than the
     // message this hook was written to improve. (I shipped exactly that for one
     // build; `skrr shortcuts lst` said nothing and exited 0.)
-    throw new Error((0, command_miss_1.describeCommandMiss)((0, command_miss_1.lookupFromConfig)(this.config), id));
+    throw new Error((0, command_miss_1.describeCommandMiss)(lookup, id));
 };
 exports.default = hook;
 class VirtualUsageFlagError extends Error {

package/dist/lib/command-miss.d.ts

@@ -57,7 +57,20 @@ export declare function nearestCommands(id: string, all: string[], limit?: numbe
  */
 export declare function helpSubjectId(tokens: readonly string[], config: CommandLookup): string;
 /**
- * The message for a colon-joined id that did not resolve.
+ * A command miss, in parts: what is wrong, what to do, and the commands that
+ * would do it. The text a person reads is `message` and `fix` on separate lines;
+ * a script reads `suggestions` without parsing either (OSK-16434).
+ */
+export type CommandMiss = {
+    message: string;
+    fix?: string;
+    /** Full commands, `skrr tasks show` — never prose. */
+    suggestions: string[];
+};
+/** The text form: exactly what a miss has always printed. */
+export declare function describeCommandMiss(config: CommandLookup, id: string): string;
+/**
+ * The miss for a colon-joined id that did not resolve.
  *
  * Two shapes, in order:
  *
@@ -68,7 +81,7 @@ export declare function helpSubjectId(tokens: readonly string[], config: Command
  *     suggest the nearest siblings under the same topic before falling back to
  *     the whole command list.
  */
-export declare function describeCommandMiss(config: CommandLookup, id: string): string;
+export declare function analyzeCommandMiss(config: CommandLookup, id: string): CommandMiss;
 /** Adapt an oclif `Config` to the lookup shape above. */
 export declare function lookupFromConfig(config: {
     bin: string;
@@ -80,3 +93,40 @@ export declare function lookupFromConfig(config: {
         name?: string;
     }>;
 }): CommandLookup;
+export type VerbSynonym = {
+    /** The command that really exists, colon-joined: `tasks:show`. */
+    id: string;
+    /** What the reader typed after the verb: the arguments of the real command. */
+    rest: string[];
+    /** The two spellings, spoken: `skrr tasks get` and `skrr tasks show`. */
+    typed: string;
+    resolved: string;
+};
+/**
+ * The real command a mis-spelled READ verb means, when a synonym of it exists
+ * under the same topic path.
+ *
+ * `words` are the leading, non-flag tokens as the reader typed them. The scan
+ * walks down the real topic path; at the first word that is not part of it, that
+ * word is the verb, and only a synonym that is itself a command qualifies. A
+ * word that is a real command, or a prefix of one, is never reinterpreted.
+ */
+export declare function resolveVerbSynonym(config: CommandLookup, words: readonly string[]): VerbSynonym | null;
+/**
+ * The words a person typed for the command, recovered from the process argv.
+ *
+ * oclif joins the words it takes for a command with `:`, so a positional that
+ * itself contains a colon cannot be told apart from two words in the id. The
+ * raw argv can: its leading tokens, joined, are the id.
+ */
+export declare function typedCommandWords(id: string, rawArgv: readonly string[]): string[];
+/**
+ * What `--json` prints for a miss: the same `{ok:false, error}` every other
+ * refusal prints, so a script that parses refusals parses this one — instead of
+ * `jq` reading prose and failing with "Invalid numeric literal", which is how
+ * the report found it.
+ */
+export declare function commandMissEnvelope(config: CommandLookup, id: string, words: readonly string[]): {
+    ok: false;
+    error: Record<string, unknown>;
+};