@meshy-ai/cli 0.2.0 → 0.3.0

package/dist/internal/stream.js

@@ -0,0 +1,280 @@
+/**
+ * Server-Sent Events for task status.
+ *
+ * The parser follows the WHATWG EventSource algorithm: UTF-8 is decoded
+ * across chunk boundaries, lines end at CR, LF or CRLF, an empty line
+ * dispatches the event, multi-line `data:` fields are joined with "\n",
+ * comment lines (leading ':') are ignored, `id:` and `retry:` are recorded
+ * but never used to fabricate a Last-Event-ID we did not receive.
+ *
+ * Meshy's stream emits `event: message` with the full task JSON (also as the
+ * ~10 s keep-alive) and `event: error` with `{message, status_code}` — which
+ * can arrive after an HTTP 200, so it is mapped exactly like an HTTP failure.
+ */
+import { codeForStatus, MeshyApiError } from "../client/errors.js";
+import { TaskSchema, isTerminalStatus } from "../client/types.js";
+import { CliError } from "./errors.js";
+export const DEFAULT_MAX_SSE_EVENT_BYTES = 1024 * 1024;
+export function createSseParser(opts = {}) {
+    const maxEventBytes = opts.maxEventBytes ?? DEFAULT_MAX_SSE_EVENT_BYTES;
+    const decoder = new TextDecoder("utf-8");
+    let buffer = "";
+    let eventType = "";
+    let dataLines = [];
+    let lastId = null;
+    let retry = null;
+    let pendingBytes = 0;
+    let first = true;
+    function dispatch(out) {
+        if (dataLines.length === 0) {
+            eventType = "";
+            pendingBytes = 0;
+            return;
+        }
+        out.push({ event: eventType || "message", data: dataLines.join("\n"), id: lastId, retry });
+        eventType = "";
+        dataLines = [];
+        pendingBytes = 0;
+    }
+    function processLine(line, out) {
+        if (line === "") {
+            dispatch(out);
+            return;
+        }
+        if (line.startsWith(":"))
+            return; // comment / heartbeat
+        let field;
+        let value;
+        const colon = line.indexOf(":");
+        if (colon === -1) {
+            field = line;
+            value = "";
+        }
+        else {
+            field = line.slice(0, colon);
+            value = line.slice(colon + 1);
+            if (value.startsWith(" "))
+                value = value.slice(1);
+        }
+        switch (field) {
+            case "event":
+                eventType = value;
+                break;
+            case "data":
+                pendingBytes += Buffer.byteLength(value, "utf8") + 1;
+                if (pendingBytes > maxEventBytes) {
+                    throw new CliError({ code: "protocol", message: `SSE event exceeds ${maxEventBytes} bytes` });
+                }
+                dataLines.push(value);
+                break;
+            case "id":
+                if (!value.includes(" "))
+                    lastId = value;
+                break;
+            case "retry": {
+                const n = Number(value);
+                if (Number.isInteger(n) && n >= 0)
+                    retry = n;
+                break;
+            }
+            default:
+                break; // unknown fields are ignored per spec
+        }
+    }
+    function consume(text, out, final) {
+        buffer += text;
+        if (first && buffer.startsWith("\uFEFF"))
+            buffer = buffer.slice(1);
+        first = false;
+        let start = 0;
+        for (;;) {
+            const cr = buffer.indexOf("\r", start);
+            const lf = buffer.indexOf("\n", start);
+            let end;
+            let next;
+            if (cr === -1 && lf === -1)
+                break;
+            if (cr !== -1 && (lf === -1 || cr < lf)) {
+                // CR, possibly followed by LF. A trailing CR at the very end of the
+                // buffer may be half of a CRLF — wait for more bytes unless final.
+                if (cr === buffer.length - 1 && !final)
+                    break;
+                end = cr;
+                next = buffer[cr + 1] === "\n" ? cr + 2 : cr + 1;
+            }
+            else {
+                end = lf;
+                next = lf + 1;
+            }
+            processLine(buffer.slice(start, end), out);
+            start = next;
+        }
+        buffer = buffer.slice(start);
+        if (buffer.length > maxEventBytes) {
+            throw new CliError({ code: "protocol", message: `SSE line exceeds ${maxEventBytes} bytes without a line ending` });
+        }
+    }
+    return {
+        feed(chunk) {
+            const out = [];
+            consume(decoder.decode(chunk, { stream: true }), out, false);
+            return out;
+        },
+        end() {
+            const out = [];
+            consume(decoder.decode(), out, true);
+            if (buffer.length > 0) {
+                processLine(buffer, out);
+                buffer = "";
+            }
+            dispatch(out);
+            return out;
+        },
+    };
+}
+/**
+ * Open the task stream and consume it until a terminal task, an API error
+ * event, a deadline, a disconnect or an abort. The connection is always closed
+ * before this resolves.
+ */
+export async function streamTask(endpoint, taskId, opts) {
+    const started = performance.now();
+    const total = new AbortController();
+    const idle = new AbortController();
+    const totalTimer = setTimeout(() => total.abort(new Error("total timeout")), opts.timeoutMs);
+    let idleTimer;
+    const resetIdle = () => {
+        if (idleTimer)
+            clearTimeout(idleTimer);
+        idleTimer = setTimeout(() => idle.abort(new Error("idle timeout")), opts.idleTimeoutMs);
+    };
+    const signals = [total.signal, idle.signal];
+    if (opts.signal)
+        signals.push(opts.signal);
+    const signal = AbortSignal.any(signals);
+    const state = { task: null, raw: null, events: 0 };
+    const finish = (reason, error = null) => ({
+        reason,
+        task: state.task,
+        raw: state.raw,
+        events: state.events,
+        error,
+        elapsedMs: performance.now() - started,
+    });
+    const classifyAbort = () => {
+        if (opts.signal?.aborted)
+            return "interrupted";
+        if (total.signal.aborted)
+            return "timeout";
+        if (idle.signal.aborted)
+            return "idle_timeout";
+        return "disconnected";
+    };
+    let handle = null;
+    try {
+        resetIdle();
+        try {
+            handle = await endpoint.openStream(taskId, { signal, connectTimeoutMs: Math.min(opts.timeoutMs, opts.idleTimeoutMs) });
+        }
+        catch (err) {
+            if (signal.aborted)
+                return finish(classifyAbort());
+            throw err;
+        }
+        const contentType = handle.response.headers.get("content-type") ?? "";
+        if (!/text\/event-stream/i.test(contentType)) {
+            return finish("protocol", new CliError({ code: "protocol", message: `stream endpoint answered with content-type '${contentType || "(none)"}' instead of text/event-stream` }));
+        }
+        const body = handle.response.body;
+        if (!body)
+            return finish("protocol", new CliError({ code: "protocol", message: "stream response has no body" }));
+        const reader = body.getReader();
+        const parser = createSseParser({ maxEventBytes: opts.maxEventBytes });
+        const handleEvent = async (ev) => {
+            if (ev.event === "error") {
+                let payload = {};
+                try {
+                    payload = JSON.parse(ev.data);
+                }
+                catch {
+                    return finish("protocol", new CliError({ code: "protocol", message: `stream error event is not JSON: ${ev.data.slice(0, 200)}` }));
+                }
+                const status = typeof payload.status_code === "number" ? payload.status_code : 0;
+                const message = typeof payload.message === "string" ? payload.message : "stream error";
+                const apiErr = new MeshyApiError({
+                    message: `meshy stream ${status || "error"} on ${endpoint.streamPath(taskId)}: ${message}`,
+                    status,
+                    code: status ? codeForStatus(status) : "server",
+                    path: endpoint.streamPath(taskId),
+                    body: payload,
+                });
+                return finish("error", apiErr);
+            }
+            if (ev.event !== "message") {
+                opts.onUnknownEvent?.(ev);
+                return null;
+            }
+            let json;
+            try {
+                json = JSON.parse(ev.data);
+            }
+            catch {
+                return finish("protocol", new CliError({ code: "protocol", message: `stream message is not JSON: ${ev.data.slice(0, 200)}` }));
+            }
+            const parsed = TaskSchema.safeParse(json);
+            if (!parsed.success) {
+                return finish("protocol", new CliError({ code: "protocol", message: `stream message is not a task: ${parsed.error.message}` }));
+            }
+            state.task = parsed.data;
+            state.raw = json;
+            state.events += 1;
+            await opts.onTask?.(parsed.data, json);
+            if (isTerminalStatus(parsed.data.status))
+                return finish("terminal");
+            return null;
+        };
+        for (;;) {
+            let chunk;
+            try {
+                chunk = await reader.read();
+            }
+            catch (err) {
+                if (signal.aborted)
+                    return finish(classifyAbort());
+                return finish("disconnected", new CliError({ code: "network", message: `stream disconnected: ${err instanceof Error ? err.message : String(err)}` }));
+            }
+            if (signal.aborted)
+                return finish(classifyAbort());
+            if (chunk.done) {
+                for (const ev of parser.end()) {
+                    const out = await handleEvent(ev);
+                    if (out)
+                        return out;
+                }
+                if (state.task === null)
+                    return finish("protocol", new CliError({ code: "protocol", message: "stream ended without any task event" }));
+                return finish("disconnected", new CliError({ code: "network", message: `stream ended before the task reached a terminal status (last status: ${state.task.status})` }));
+            }
+            resetIdle(); // any bytes — keep-alives, comments, partial lines — count as liveness
+            let parsedEvents;
+            try {
+                parsedEvents = parser.feed(chunk.value);
+            }
+            catch (err) {
+                return finish("protocol", err instanceof CliError ? err : new CliError({ code: "protocol", message: String(err) }));
+            }
+            for (const ev of parsedEvents) {
+                const out = await handleEvent(ev);
+                if (out)
+                    return out;
+            }
+        }
+    }
+    finally {
+        clearTimeout(totalTimer);
+        if (idleTimer)
+            clearTimeout(idleTimer);
+        handle?.close();
+    }
+}
+//# sourceMappingURL=stream.js.map

package/dist/internal/stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/internal/stream.ts"],"names":[],"mappings":"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"}

package/dist/internal/task-command.d.ts

@@ -1,13 +1,38 @@
 /**
- * Factory that wires the uniform get/list/delete/wait/create subcommands for
- * any async-task resource. Keeps the per-resource modules focused on their
- * unique create-flag shape.
+ * Factory that wires the uniform create/get/list/wait/stream/delete
+ * subcommands for any registered task resource. Per-resource modules only
+ * contribute their unique `create` flag shape and payload validation.
+ *
+ * Two output schemas share one execution path:
+ *   legacy — the 0.2.0 payloads and `-o` status report, with two documented
+ *            fixes: `get` of a non-terminal task exits 0, and async create
+ *            never polls.
+ *   v1     — one `meshy.cli/v1` envelope whose result carries the TaskView,
+ *            the submission record and the download manifest.
+ *
+ * Money rules enforced here, independent of schema:
+ *   - every create is exactly one POST, journaled before it is sent;
+ *   - a lost or malformed response is `submission_unknown` (exit 10), never a
+ *     retry and never a "please run it again" hint;
+ *   - local targets that would fail after the POST (an existing --save-json
+ *     file, an -o path outside the workspace, a missing --project) are checked
+ *     before it, so a detectable conflict costs zero requests;
+ *   - once the server has accepted a task, every later failure — saving JSON,
+ *     polling, downloading, recording, a signal — still reports that task id,
+ *     the submission record and the `get`/`wait` commands that resume it;
+ *   - SIGINT stops waiting/streaming (exit 130) and never deletes anything.
  */
 import { Command } from "commander";
 import type { TaskEndpoint } from "../client/endpoints/base.js";
-import type { MeshyClient, ResourceName } from "../client/index.js";
-import { type Runtime } from "./runtime.js";
+import type { MeshyClient } from "../client/index.js";
+import { type TaskResourceDescriptor } from "../client/resource-registry.js";
 import { type Task } from "../client/types.js";
+import { type SavedJson } from "./command-helpers.js";
+import { CliError, type Warning } from "./errors.js";
+import type { MaterialLinkReport } from "./material-links.js";
+import { type Runtime } from "./runtime.js";
+import { type TaskView } from "./task-view.js";
+import { type AuthorisedRoot } from "./paths.js";
 export interface CreateSpec {
     description: string;
     /** Attach resource-specific flags; return a structured payload. */
@@ -20,20 +45,112 @@ export interface CreateSpec {
      * not throw (validation belongs in toPayload).
      */
     toDefaults?(opts: Record<string, unknown>): Record<string, unknown>;
+    /**
+     * Payload keys holding nested option objects that must merge field by field
+     * across defaults < --data < flags (e.g. Creative Lab `options`, `output`).
+     * Everything else merges shallowly: arrays and scalars replace wholesale.
+     */
+    nestedObjectKeys?: readonly string[];
+    /**
+     * Validate the merged payload (defaults < --data < flags) before media is
+     * normalised and before anything is sent. Throw UsageError / CliError.
+     */
+    validatePayload?(payload: Record<string, unknown>, opts: Record<string, unknown>): void;
 }
 export interface ResourceCommandSpec {
-    name: ResourceName;
+    /** Registry id of the task resource this command drives. */
+    name: string;
+    /** Commander name when it differs from the id (Creative Lab stages). */
+    commandName?: string;
+    /** Dotted prefix for v1 `command` (defaults to the id). */
+    commandPrefix?: string;
     description: string;
     supportsList?: boolean;
+    /** Default output schema for this resource's verbs (`legacy` for 0.2.0 commands). */
+    defaultSchema?: "legacy" | "v1";
     create: CreateSpec;
-    endpointOf(client: MeshyClient): TaskEndpoint;
+    /** Optional override; defaults to the registry endpoint for `name`. */
+    endpointOf?(client: MeshyClient): TaskEndpoint;
+}
+export interface DownloadOutcome {
+    state: "not_requested" | "not_ready" | "completed" | "partial" | "failed";
+    files: Array<{
+        key?: string;
+        path: string;
+        status: "written" | "failed";
+        bytes?: number;
+        sha256?: string;
+        error?: string | null;
+    }>;
+    metadata_path: string | null;
+    /** OBJ/MTL/texture reference report when the download contained a text OBJ. */
+    material_links?: MaterialLinkReport | null;
+    /** Set when the transfers landed but a later step (relink | digest | sidecar) failed or was interrupted. */
+    failed_step?: string;
+}
+export interface SubmissionInfo {
+    state: string;
+    operation_id: string | null;
+    task_id?: string | null;
+    request_id?: string | null;
 }
+interface TaskResultOptions {
+    task: Task | null;
+    raw: unknown;
+    descriptor: TaskResourceDescriptor;
+    includeRaw: boolean;
+    submission: SubmissionInfo;
+    downloads?: DownloadOutcome;
+    savedJson?: SavedJson | null;
+    extra?: Record<string, unknown>;
+}
+declare function taskResult(o: TaskResultOptions): Record<string, unknown>;
+declare function nextCommands(descriptor: TaskResourceDescriptor, taskId: string): Record<string, string>;
+/**
+ * Re-throw any error as a CliError whose `result` carries `result` — keeping
+ * the original classification (code, HTTP status, hint, recovery, exit code).
+ * A CliError's own partial result (files written so far, a failed download
+ * manifest) is merged on top, so nothing already known is lost.
+ */
+export declare function wrapWithResult(err: unknown, result: Record<string, unknown>): CliError;
+/** `-o` target: inside the workspace (or its own directory), no symlink leaf, not an existing file. */
+export declare function preflightOutputPath(output: string, workspace: string | AuthorisedRoot | undefined, cwd?: string): void;
+/** `--save-json` target: inside the workspace (or its own directory), no symlink leaf, not an existing file. */
+export declare function preflightSaveJsonPath(target: string, workspace: string | AuthorisedRoot | undefined, cwd?: string): void;
 export declare function buildResourceCommand(spec: ResourceCommandSpec): Command;
+export interface Submitted {
+    taskId: string;
+    raw: unknown;
+    requestId: string | null;
+    operationId: string;
+    warnings: Warning[];
+}
+export interface SubmitContext {
+    /** Names the request in messages, e.g. "make: the text-to-3d preview (geometry) request". */
+    label?: string;
+    /** Extra keys carried in every failure result (e.g. `{ step: 1 }`). */
+    extraResult?: Record<string, unknown>;
+}
+/**
+ * The credential identity a submission is journaled under: bound to the key
+ * digest, the OAuth subject or the OAuth login id. `verified` is false when
+ * none of those exists (a pre-login-id OAuth profile): such a credential may
+ * start operations but is refused a replay of an existing record.
+ */
+export declare function credentialIdentityFor(runtime: Runtime, apiOrigin: string): {
+    fingerprint: string;
+    verified: boolean;
+};
 /**
- * Decide how to report a task whose status is (expected to be) terminal:
- *   - with `-o`: download artifacts to the filesystem and print the status
- *     report. Failed/timed-out tasks print the FAIL form without downloads.
- *   - without `-o`: emit the familiar JSON/pretty summary to stdout.
+ * Journal → single POST → journal update. Every failure path leaves a record
+ * that says what is known; the unknown state is reported as exit 10 with the
+ * operation id and never as a suggestion to submit again. Shared by the
+ * resource commands and `make`, so there is exactly one submission state
+ * machine.
  */
+export declare function submitCreate(runtime: Runtime, descriptor: TaskResourceDescriptor, endpoint: TaskEndpoint, payload: Record<string, unknown>, requestedOperationId: string | null, ctx?: SubmitContext): Promise<Submitted>;
+/** Kept for make.ts (legacy path). */
 export declare function emitTerminalOutcome(task: Task, timedOut: boolean, elapsedSeconds: number | undefined, resourceName: string, runtime: Runtime): Promise<void>;
+export { taskResult as buildTaskResult, nextCommands as taskNextCommands };
+export type { TaskView };
 //# sourceMappingURL=task-command.d.ts.map

package/dist/internal/task-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-command.d.ts","sourceRoot":"","sources":["../../src/internal/task-command.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQpE,OAAO,EAAgB,KAAK,OAAO,EAAmB,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAoC,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAIjF,MAAM,WAAW,UAAU;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,SAAS,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;IACjC,6EAA6E;IAC7E,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClE;;;;OAIG;IACH,UAAU,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrE;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,YAAY,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY,CAAC;CAC/C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CA2HvE;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,OAAO,EACjB,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAgDf"}
+{"version":3,"file":"task-command.d.ts","sourceRoot":"","sources":["../../src/internal/task-command.ts"],"names":[],"mappings":"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"}