@skrr-ai/cli 0.1.130 → 0.1.131

package/dist/commands/agent/message/send.js

@@ -747,6 +747,9 @@ function normalizeIntentPayload({ agentId, jsonBody, merged, }) {
     const overlayChannel = optionalString(merged.channelId);
     const overlayThreadTs = optionalString(merged.threadTs);
     const destinationKind = pickDestinationKind({ bodyDestination, overlayKind });
+    if (destinationKind !== 'slack_channel' && (overlayThreadTs || bodyDestination?.threadTs)) {
+        throw invalidIntent('--thread-ts / destination.threadTs only applies to slack_channel.');
+    }
     const destination = buildDestination({
         kind: destinationKind,
         bodyDestination,

package/dist/commands/agents/schedule-trace.js

@@ -25,7 +25,7 @@ class AgentsScheduleTrace extends base_command_1.BaseCommand {
     };
     static flags = {
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
-        date: core_1.Flags.string({ description: 'Plan date (YYYY-MM-DD). Defaults to today.' }),
+        date: core_1.Flags.string({ description: 'Plan date (YYYY-MM-DD). Defaults to today in the plan timezone.' }),
         todo: core_1.Flags.string({ description: 'Scope the trace to one to-do' }),
         timezone: core_1.Flags.string({ description: 'IANA timezone for the plan day' }),
         limit: core_1.Flags.integer({ description: 'Events to return (1-200)' }),
@@ -34,16 +34,25 @@ class AgentsScheduleTrace extends base_command_1.BaseCommand {
     async run() {
         this.requireAuth();
         const { args, flags } = await this.parse(AgentsScheduleTrace);
-        // The server requires a plan date. Defaulting to today locally keeps the
-        // common call a single argument rather than a date the caller must know.
-        const date = flags.date ?? new Date().toISOString().slice(0, 10);
+        // Use the same zone for choosing the day and querying its events. UTC can
+        // already be tomorrow while it is still evening for the reader.
+        const timezone = flags.timezone ?? (flags.date ? undefined : Intl.DateTimeFormat().resolvedOptions().timeZone);
+        let date = flags.date;
+        if (!date) {
+            try {
+                date = (0, schedule_1.scheduleTraceToday)(new Date(), timezone);
+            }
+            catch {
+                this.error(`Invalid IANA timezone: ${timezone}`, { exit: 1 });
+            }
+        }
         let trace;
         try {
             trace = await schedule_1.scheduleApi.scheduleTrace({
                 agentId: args.agent,
                 date,
                 todoId: flags.todo,
-                timezone: flags.timezone,
+                timezone,
                 limit: flags.limit,
                 cursor: flags.cursor,
             });

package/dist/commands/harnesses/prune.d.ts

@@ -18,6 +18,7 @@ export default class HarnessesPrune extends BaseCommand {
         yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         limit: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'older-than': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'include-gone-leases': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         json: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/dist/commands/harnesses/prune.js

@@ -30,12 +30,20 @@ class HarnessesPrune extends base_command_1.BaseCommand {
         'pinned row is KEPT, with the agents named. Move the pin (`agents attach-harness`) and run this again.\n\n' +
         'At most --limit rows are removed per run, oldest first; the rest are counted and the next run takes ' +
         'them. Running it again when nothing qualifies removes nothing. A daemon that is still running ' +
-        're-registers on its next connection, so removing a row never stops a machine.';
+        're-registers on its next connection, so removing a row never stops a machine.\n\n' +
+        'A hosted, dedicated or cloud machine belongs to its lease, so by default it is never touched. ' +
+        '--include-gone-leases also considers the rows of such a machine whose lease is GONE (archived, ' +
+        'terminating, terminated, failed or lost): no compute runs on it again, so the row can never come ' +
+        'back online. A row with no lease, a lease that can come back (stopped, ready, active) and a row ' +
+        'with usage recorded against it are kept, and so is everything the rules above keep. Use --older-than ' +
+        'to leave recent ones, for example 30d.';
     static examples = [
         '<%= config.bin %> harnesses prune',
         '<%= config.bin %> harnesses prune --yes',
         '<%= config.bin %> harnesses prune --yes --limit 20',
         '<%= config.bin %> harnesses prune --older-than 7d --json',
+        '<%= config.bin %> harnesses prune --include-gone-leases --older-than 30d',
+        '<%= config.bin %> harnesses prune --include-gone-leases --older-than 30d --yes --limit 200',
     ];
     static flags = {
         yes: core_1.Flags.boolean({
@@ -50,6 +58,10 @@ class HarnessesPrune extends base_command_1.BaseCommand {
         'older-than': core_1.Flags.string({
             description: 'Only rows unseen for at least this long: 90m, 36h or 7d (default 24h). The server never goes below its offline window.',
         }),
+        'include-gone-leases': core_1.Flags.boolean({
+            description: 'Also consider the rows of hosted, dedicated or cloud machines whose lease is gone. Off by default.',
+            default: false,
+        }),
         json: core_1.Flags.boolean({ description: 'Output as JSON' }),
     };
     async run() {
@@ -71,6 +83,7 @@ class HarnessesPrune extends base_command_1.BaseCommand {
                 dryRun: !flags.yes,
                 ...(flags.limit !== undefined ? { limit: flags.limit } : {}),
                 ...(minUnseenMs !== undefined ? { minUnseenMs } : {}),
+                ...(flags['include-gone-leases'] ? { includeGoneLeases: true } : {}),
             });
         }
         catch (err) {
@@ -86,7 +99,9 @@ class HarnessesPrune extends base_command_1.BaseCommand {
     render(result) {
         const { dryRun } = result;
         const removing = dryRun ? result.remove.length : result.removedCount;
-        const noun = (n) => `${n} superseded harness row${n === 1 ? '' : 's'}`;
+        // "superseded" is only true of the personal-machine rows; a gone-lease row was not replaced by anything.
+        const kind = result.remove.some((row) => row.goneLease) ? '' : 'superseded ';
+        const noun = (n) => `${n} ${kind}harness row${n === 1 ? '' : 's'}`;
         if (dryRun) {
             this.log('Dry run - nothing was removed.');
         }
@@ -141,6 +156,9 @@ class HarnessesPrune extends base_command_1.BaseCommand {
         if (count('not_personal_machine') > 0) {
             passedOver.push(`${count('not_personal_machine')} hosted, dedicated, cloud or of unknown origin`);
         }
+        if (count('lease_not_gone') > 0) {
+            passedOver.push(`${count('lease_not_gone')} of a machine whose lease is not gone`);
+        }
         if (count('no_machine_identity') > 0) {
             passedOver.push(`${count('no_machine_identity')} that name no machine`);
         }
@@ -159,13 +177,15 @@ class HarnessesPrune extends base_command_1.BaseCommand {
             provider: (0, format_1.formatCell)(row.provider),
             daemon: (0, format_1.formatCell)(row.daemonId),
             seen: (0, format_1.localStamp)(row.lastSeenAt),
-            replacedBy: (0, format_1.formatCell)(row.supersededBy?.daemonId),
+            replacedBy: row.goneLease
+                ? `lease gone (${row.goneLease})`
+                : (0, format_1.formatCell)(row.supersededBy?.daemonId),
         })), [
             { key: 'id', header: 'HARNESS ID' },
             { key: 'provider', header: 'PROVIDER' },
             { key: 'daemon', header: 'DAEMON ID', verbatim: true },
             { key: 'seen', header: `LAST SEEN (${(0, format_1.localZone)()})` },
-            { key: 'replacedBy', header: 'REPLACED BY (ONLINE)', verbatim: true },
+            { key: 'replacedBy', header: 'REPLACED BY (ONLINE) / LEASE', verbatim: true },
         ], (line) => this.log(line));
     }
 }

package/dist/lib/exec-runtime-binary.js

@@ -75,9 +75,10 @@ function forwardedFlagsNote(verb, opts = {}) {
     // daemon cannot silently end up on a different deployment than the CLI that
     // installed it (OSK-279). Saying so is the difference between a flag you may
     // pass and a flag that is already being passed for you.
+    const help = `${base} If \`skrrd\` is not on your PATH, use its installed path instead (typically \`~/.skrr/bin/skrrd\` on macOS and Linux).`;
     return opts.binds
-        ? `${base} \`--server\` and \`--profile\` are filled in from your CLI session unless you pass them.`
-        : base;
+        ? `${help} \`--server\` and \`--profile\` are filled in from your CLI session unless you pass them.`
+        : help;
 }
 /** Extra well-known install locations for one runtime name, checked after PATH. */
 function fallbackPathsForRuntime(name) {

package/dist/lib/harnesses.d.ts

@@ -243,7 +243,7 @@ export declare function forgetHarness(id: string): Promise<unknown>;
  * server (`pruneSupersededHarnesses.js`, `REASONS`) and worded once, in
  * `harnessPruneReasonSentence`, so the table and `--json` never disagree.
  */
-export type HarnessPruneReason = 'recent' | 'latest_registration' | 'no_live_sibling' | 'pinned' | 'granted' | 'default' | 'aliased' | 'changed_since_plan';
+export type HarnessPruneReason = 'recent' | 'latest_registration' | 'no_live_sibling' | 'has_usage' | 'pinned' | 'granted' | 'default' | 'aliased' | 'changed_since_plan';
 export interface HarnessPruneRow {
     id: string;
     daemonId: string | null;
@@ -257,6 +257,8 @@ export interface HarnessPruneRow {
         daemonId: string | null;
         lastSeenAt: string | null;
     };
+    /** The gone lease a row this call removes (or would) belonged to (`--include-gone-leases`). */
+    goneLease?: string;
     /** Set on kept rows. */
     reason?: HarnessPruneReason;
     /** For `pinned`: who holds the pin. Other people's agents are a count, never named. */
@@ -300,6 +302,7 @@ export declare function pruneHarnesses(options?: {
     dryRun: boolean;
     limit?: number;
     minUnseenMs?: number;
+    includeGoneLeases?: boolean;
 }): Promise<HarnessPruneResult>;
 /**
  * `--older-than` takes a whole number with a unit: `90m`, `36h`, `7d`. A bare

package/dist/lib/harnesses.js

@@ -192,6 +192,7 @@ async function pruneHarnesses(options = { dryRun: true }) {
             dryRun: options.dryRun,
             ...(options.limit !== undefined ? { limit: options.limit } : {}),
             ...(options.minUnseenMs !== undefined ? { minUnseenMs: options.minUnseenMs } : {}),
+            ...(options.includeGoneLeases ? { includeGoneLeases: true } : {}),
         },
     });
 }
@@ -219,6 +220,8 @@ function harnessPruneReasonSentence(row) {
             return 'the newest registration of its provider on that machine';
         case 'no_live_sibling':
             return 'nothing has replaced it - no daemon on that machine is online for this provider';
+        case 'has_usage':
+            return 'usage is recorded against it, so the row keeps the name that usage is attributed to';
         case 'pinned': {
             const names = (row.detail?.agents ?? []).map((a) => a.name ?? a.id);
             const more = row.detail?.moreAgents ?? 0;

package/dist/lib/schedule.d.ts

@@ -145,6 +145,8 @@ export interface ScheduleTrace {
     has_more?: boolean;
     next_cursor?: string | null;
 }
+/** Calendar day at an instant in the zone used for the schedule query. */
+export declare function scheduleTraceToday(now: Date, timezone: string): string;
 export declare function scheduleTracePath(params: {
     agentId: string;
     date: string;

package/dist/lib/schedule.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleApi = void 0;
+exports.scheduleTraceToday = scheduleTraceToday;
 exports.scheduleTracePath = scheduleTracePath;
 exports.isSmartScheduleProposal = isSmartScheduleProposal;
 exports.describeNonProposal = describeNonProposal;
@@ -29,6 +30,17 @@ exports.proposalToApproveTodos = proposalToApproveTodos;
 const data_provider_1 = require("@skrr-ai/data-provider");
 const format_1 = require("./format");
 const triggers_1 = require("./triggers");
+/** Calendar day at an instant in the zone used for the schedule query. */
+function scheduleTraceToday(now, timezone) {
+    const parts = new Intl.DateTimeFormat('en-CA', {
+        timeZone: timezone,
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+    }).formatToParts(now);
+    const part = (type) => parts.find((item) => item.type === type)?.value;
+    return `${part('year')}-${part('month')}-${part('day')}`;
+}
 function scheduleTracePath(params) {
     return (0, triggers_1.withQuery)('/api/todos/smart-schedule/trace', {
         agentId: params.agentId,