@wujiland/cli 1.0.0 → 1.0.2

package/dist/commands/create.js

@@ -137,10 +137,9 @@ export async function create(ctx) {
     if (reg.status === "failed") {
         throw new CliError(EXIT.OUTSIDE, "PROVISION_FAILED", `Provisioning ${slug} stopped: ${JSON.stringify(reg.failure)}.`, `inca create ${slug} again resumes from the failed step.`, { failure: reg.failure });
     }
-    const main = await gitOk(deps, dir, ["ls-remote", "--heads", "origin", "refs/heads/main"]);
-    // Only the first run pushes main, and only main's own commit; a resumed run never ships local dev.
-    if (main.stdout.trim() === "")
-        await gitOk(deps, dir, ["push", "origin", "refs/heads/main:refs/heads/main"]);
+    // Local main (the template plus the config commit), never HEAD: a resumed run cannot ship local dev.
+    // Not forced, so it only ever fast-forwards.
+    await gitOk(deps, dir, ["push", "origin", "refs/heads/main:refs/heads/main"]);
     const dev = await gitOk(deps, dir, ["ls-remote", "--heads", "origin", "refs/heads/dev"]);
     if (dev.stdout.trim() === "") {
         await gitOk(deps, dir, ["push", "origin", "HEAD:refs/heads/dev"]);

package/dist/commands/ops.d.ts

@@ -19,3 +19,5 @@ export declare function versions(ctx: Ctx): Promise<Outcome>;
 export declare function rollback(ctx: Ctx): Promise<Outcome>;
 export declare function logs(ctx: Ctx): Promise<Outcome>;
 export declare function accessShow(ctx: Ctx): Promise<Outcome>;
+/** `--since 30m`, `2h`, `1d` or an ISO time → the ISO time the manager takes (04-manager.md §11). */
+export declare function logTime(ctx: Ctx, flag: "since" | "until"): string | undefined;

package/dist/commands/ops.js

@@ -134,11 +134,12 @@ export async function logs(ctx) {
     const interval = Number(str(ctx.flags, "interval") ?? "15");
     if (!Number.isFinite(interval) || interval < 5)
         throw usage("--interval is at least 5 seconds.");
+    const times = { since: logTime(ctx, "since"), until: logTime(ctx, "until") };
     const m = await managerClient(ctx.deps);
     const q = (since) => {
         const p = new URLSearchParams({ env });
         for (const k of ["since", "until", "level", "request"]) {
-            const v = k === "since" && since ? since : str(ctx.flags, k);
+            const v = k === "since" && since ? since : k === "since" || k === "until" ? times[k] : str(ctx.flags, k);
             if (v !== undefined)
                 p.set(k, v);
         }
@@ -176,3 +177,18 @@ export async function accessShow(ctx) {
     }
     return { data: { slug, workers: r.workers }, human, pending };
 }
+/** `--since 30m`, `2h`, `1d` or an ISO time → the ISO time the manager takes (04-manager.md §11). */
+export function logTime(ctx, flag) {
+    const raw = str(ctx.flags, flag);
+    if (raw === undefined)
+        return undefined;
+    const rel = /^(\d+)(s|m|h|d)$/.exec(raw);
+    if (rel) {
+        const unit = { s: 1, m: 60, h: 3600, d: 86400 }[rel[2]];
+        return new Date(ctx.deps.now() - Number(rel[1]) * unit * 1000).toISOString();
+    }
+    const t = Date.parse(raw);
+    if (Number.isNaN(t))
+        throw usage(`--${flag} takes a duration (30m, 2h, 1d) or an ISO time, not ${JSON.stringify(raw)}.`);
+    return new Date(t).toISOString();
+}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const CLI_VERSION = "1.0.0";
+export declare const CLI_VERSION = "1.0.2";

package/dist/version.js

@@ -1,2 +1,2 @@
 // Equals cli/package.json "version"; a test keeps them in step.
-export const CLI_VERSION = "1.0.0";
+export const CLI_VERSION = "1.0.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wujiland/cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "inca: the command line for the whole life of an Inca app.",
   "license": "MIT",
   "type": "module",