@meshy-ai/cli 0.4.6 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -6
- package/dist/client/endpoints/balance.d.ts +4 -3
- package/dist/client/endpoints/balance.d.ts.map +1 -1
- package/dist/client/endpoints/balance.js +10 -12
- package/dist/client/endpoints/balance.js.map +1 -1
- package/dist/client/endpoints/base.d.ts +0 -2
- package/dist/client/endpoints/base.d.ts.map +1 -1
- package/dist/client/endpoints/base.js.map +1 -1
- package/dist/client/index.d.ts +0 -6
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +2 -22
- package/dist/client/index.js.map +1 -1
- package/dist/client/resource-registry.d.ts +2 -9
- package/dist/client/resource-registry.d.ts.map +1 -1
- package/dist/client/resource-registry.js +5 -14
- package/dist/client/resource-registry.js.map +1 -1
- package/dist/client/transport.d.ts +1 -1
- package/dist/client/transport.d.ts.map +1 -1
- package/dist/client/types.d.ts +4 -26
- package/dist/client/types.d.ts.map +1 -1
- package/dist/client/types.js +4 -31
- package/dist/client/types.js.map +1 -1
- package/dist/cmd/animation-catalog.js +4 -4
- package/dist/cmd/animation-catalog.js.map +1 -1
- package/dist/cmd/api.d.ts.map +1 -1
- package/dist/cmd/api.js +5 -5
- package/dist/cmd/api.js.map +1 -1
- package/dist/cmd/auth.d.ts.map +1 -1
- package/dist/cmd/auth.js +41 -25
- package/dist/cmd/auth.js.map +1 -1
- package/dist/cmd/auto-split.d.ts.map +1 -1
- package/dist/cmd/auto-split.js +0 -1
- package/dist/cmd/auto-split.js.map +1 -1
- package/dist/cmd/balance.d.ts.map +1 -1
- package/dist/cmd/balance.js +6 -6
- package/dist/cmd/balance.js.map +1 -1
- package/dist/cmd/creative-lab.d.ts +0 -2
- package/dist/cmd/creative-lab.d.ts.map +1 -1
- package/dist/cmd/creative-lab.js +0 -7
- package/dist/cmd/creative-lab.js.map +1 -1
- package/dist/cmd/delete.d.ts.map +1 -1
- package/dist/cmd/delete.js +4 -4
- package/dist/cmd/delete.js.map +1 -1
- package/dist/cmd/doctor.js +4 -4
- package/dist/cmd/doctor.js.map +1 -1
- package/dist/cmd/download.d.ts +1 -1
- package/dist/cmd/download.js +9 -9
- package/dist/cmd/download.js.map +1 -1
- package/dist/cmd/image-to-3d.d.ts +3 -3
- package/dist/cmd/image-to-3d.d.ts.map +1 -1
- package/dist/cmd/image-to-3d.js +16 -45
- package/dist/cmd/image-to-3d.js.map +1 -1
- package/dist/cmd/image-to-image.d.ts.map +1 -1
- package/dist/cmd/image-to-image.js +2 -1
- package/dist/cmd/image-to-image.js.map +1 -1
- package/dist/cmd/inspect.d.ts +12 -4
- package/dist/cmd/inspect.d.ts.map +1 -1
- package/dist/cmd/inspect.js +63 -39
- package/dist/cmd/inspect.js.map +1 -1
- package/dist/cmd/make.d.ts.map +1 -1
- package/dist/cmd/make.js +51 -112
- package/dist/cmd/make.js.map +1 -1
- package/dist/cmd/mesh.d.ts +3 -3
- package/dist/cmd/mesh.js +5 -5
- package/dist/cmd/mesh.js.map +1 -1
- package/dist/cmd/multi-image-to-3d.d.ts +2 -3
- package/dist/cmd/multi-image-to-3d.d.ts.map +1 -1
- package/dist/cmd/multi-image-to-3d.js +10 -28
- package/dist/cmd/multi-image-to-3d.js.map +1 -1
- package/dist/cmd/operations.js +6 -6
- package/dist/cmd/operations.js.map +1 -1
- package/dist/cmd/project.d.ts.map +1 -1
- package/dist/cmd/project.js +11 -13
- package/dist/cmd/project.js.map +1 -1
- package/dist/cmd/resources.d.ts +4 -4
- package/dist/cmd/resources.d.ts.map +1 -1
- package/dist/cmd/resources.js +6 -15
- package/dist/cmd/resources.js.map +1 -1
- package/dist/cmd/retexture.d.ts +2 -2
- package/dist/cmd/retexture.js +2 -2
- package/dist/cmd/showcases.d.ts.map +1 -1
- package/dist/cmd/showcases.js +4 -4
- package/dist/cmd/showcases.js.map +1 -1
- package/dist/cmd/slicer.js +4 -4
- package/dist/cmd/slicer.js.map +1 -1
- package/dist/cmd/text-to-3d.d.ts +1 -1
- package/dist/cmd/text-to-3d.js +1 -1
- package/dist/cmd/text-to-image.d.ts.map +1 -1
- package/dist/cmd/text-to-image.js +3 -2
- package/dist/cmd/text-to-image.js.map +1 -1
- package/dist/cmd/usage.js +4 -4
- package/dist/cmd/usage.js.map +1 -1
- package/dist/cmd/uv-unwrap.d.ts +0 -1
- package/dist/cmd/uv-unwrap.d.ts.map +1 -1
- package/dist/cmd/uv-unwrap.js +0 -2
- package/dist/cmd/uv-unwrap.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +22 -53
- package/dist/index.js.map +1 -1
- package/dist/internal/artifacts.d.ts +18 -9
- package/dist/internal/artifacts.d.ts.map +1 -1
- package/dist/internal/artifacts.js +56 -30
- package/dist/internal/artifacts.js.map +1 -1
- package/dist/internal/command-helpers.d.ts +9 -16
- package/dist/internal/command-helpers.d.ts.map +1 -1
- package/dist/internal/command-helpers.js +14 -31
- package/dist/internal/command-helpers.js.map +1 -1
- package/dist/internal/config.d.ts +3 -3
- package/dist/internal/config.js +3 -3
- package/dist/internal/context.d.ts +3 -5
- package/dist/internal/context.d.ts.map +1 -1
- package/dist/internal/context.js +3 -3
- package/dist/internal/context.js.map +1 -1
- package/dist/internal/doctor.d.ts +0 -2
- package/dist/internal/doctor.d.ts.map +1 -1
- package/dist/internal/doctor.js +0 -4
- package/dist/internal/doctor.js.map +1 -1
- package/dist/internal/download.d.ts +34 -50
- package/dist/internal/download.d.ts.map +1 -1
- package/dist/internal/download.js +83 -331
- package/dist/internal/download.js.map +1 -1
- package/dist/internal/errors.d.ts +2 -20
- package/dist/internal/errors.d.ts.map +1 -1
- package/dist/internal/errors.js +9 -88
- package/dist/internal/errors.js.map +1 -1
- package/dist/internal/file-input.d.ts +0 -12
- package/dist/internal/file-input.d.ts.map +1 -1
- package/dist/internal/file-input.js +2 -49
- package/dist/internal/file-input.js.map +1 -1
- package/dist/internal/global-options.d.ts +4 -1
- package/dist/internal/global-options.d.ts.map +1 -1
- package/dist/internal/global-options.js +9 -2
- package/dist/internal/global-options.js.map +1 -1
- package/dist/internal/image-models.d.ts +7 -0
- package/dist/internal/image-models.d.ts.map +1 -1
- package/dist/internal/image-models.js +14 -0
- package/dist/internal/image-models.js.map +1 -1
- package/dist/internal/inspect.d.ts +31 -6
- package/dist/internal/inspect.d.ts.map +1 -1
- package/dist/internal/inspect.js +125 -12
- package/dist/internal/inspect.js.map +1 -1
- package/dist/internal/logger.d.ts +0 -1
- package/dist/internal/logger.d.ts.map +1 -1
- package/dist/internal/logger.js +0 -3
- package/dist/internal/logger.js.map +1 -1
- package/dist/internal/material-links.d.ts +0 -2
- package/dist/internal/material-links.d.ts.map +1 -1
- package/dist/internal/material-links.js +0 -4
- package/dist/internal/material-links.js.map +1 -1
- package/dist/internal/obj-transform.d.ts +1 -1
- package/dist/internal/obj-transform.js +1 -1
- package/dist/internal/output.d.ts +4 -13
- package/dist/internal/output.d.ts.map +1 -1
- package/dist/internal/output.js +5 -26
- package/dist/internal/output.js.map +1 -1
- package/dist/internal/paths.d.ts +2 -0
- package/dist/internal/paths.d.ts.map +1 -1
- package/dist/internal/paths.js +4 -0
- package/dist/internal/paths.js.map +1 -1
- package/dist/internal/pricing.d.ts +1 -1
- package/dist/internal/pricing.d.ts.map +1 -1
- package/dist/internal/pricing.js +1 -1
- package/dist/internal/pricing.js.map +1 -1
- package/dist/internal/project-store.d.ts +6 -13
- package/dist/internal/project-store.d.ts.map +1 -1
- package/dist/internal/project-store.js +23 -27
- package/dist/internal/project-store.js.map +1 -1
- package/dist/internal/result.d.ts +1 -2
- package/dist/internal/result.d.ts.map +1 -1
- package/dist/internal/result.js +1 -1
- package/dist/internal/result.js.map +1 -1
- package/dist/internal/runtime.d.ts +3 -19
- package/dist/internal/runtime.d.ts.map +1 -1
- package/dist/internal/runtime.js +12 -35
- package/dist/internal/runtime.js.map +1 -1
- package/dist/internal/slicers.d.ts +7 -8
- package/dist/internal/slicers.d.ts.map +1 -1
- package/dist/internal/slicers.js +7 -8
- package/dist/internal/slicers.js.map +1 -1
- package/dist/internal/task-command.d.ts +18 -14
- package/dist/internal/task-command.d.ts.map +1 -1
- package/dist/internal/task-command.js +53 -201
- package/dist/internal/task-command.js.map +1 -1
- package/dist/internal/task-view.js +1 -1
- package/dist/internal/task-view.js.map +1 -1
- package/dist/internal/texturing.d.ts +17 -0
- package/dist/internal/texturing.d.ts.map +1 -0
- package/dist/internal/texturing.js +30 -0
- package/dist/internal/texturing.js.map +1 -0
- package/dist/internal/update-notifier.d.ts +5 -25
- package/dist/internal/update-notifier.d.ts.map +1 -1
- package/dist/internal/update-notifier.js +5 -58
- package/dist/internal/update-notifier.js.map +1 -1
- package/dist/internal/views.d.ts +8 -10
- package/dist/internal/views.d.ts.map +1 -1
- package/dist/internal/views.js +61 -29
- package/dist/internal/views.js.map +1 -1
- package/dist/root.d.ts +0 -5
- package/dist/root.d.ts.map +1 -1
- package/dist/root.js +6 -24
- package/dist/root.js.map +1 -1
- package/package.json +1 -1
- package/skills/meshy-cli/SKILL.md +53 -49
- package/dist/internal/report.d.ts +0 -40
- package/dist/internal/report.d.ts.map +0 -1
- package/dist/internal/report.js +0 -48
- package/dist/internal/report.js.map +0 -1
package/dist/cmd/inspect.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* inspect faces — the face-count gate.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
4
|
+
* Three mutually exclusive sources: a local model file whose triangles are
|
|
5
|
+
* counted (no network, no credential), a saved task JSON, or exactly one GET
|
|
6
|
+
* of a task through the resource registry. The API does not report
|
|
7
|
+
* face_count, so the task sources answer `unknown` unless a count is present;
|
|
8
|
+
* a downloaded model is the source that measures. The command never downloads
|
|
9
|
+
* a model and never creates a remesh task; a failing verdict only *describes*
|
|
10
|
+
* the remesh that would help.
|
|
8
11
|
*
|
|
9
12
|
* `--max-faces` is required on purpose: the rigging ceiling (300000) is one
|
|
10
13
|
* consumer's rule and uv-unwrap's is 40000 — there is no limit that belongs
|
|
@@ -15,10 +18,10 @@ import { Command } from "commander";
|
|
|
15
18
|
import { closeSync, fstatSync, openSync, readSync } from "node:fs";
|
|
16
19
|
import { resolve as resolvePath } from "node:path";
|
|
17
20
|
import { findTaskResource, TASK_RESOURCES } from "../client/resource-registry.js";
|
|
18
|
-
import { emitResult, openCommand,
|
|
21
|
+
import { emitResult, openCommand, rejectOutputFlag, saveRawJson } from "../internal/command-helpers.js";
|
|
19
22
|
import { abortSignal } from "../internal/context.js";
|
|
20
23
|
import { CliError, UsageError } from "../internal/errors.js";
|
|
21
|
-
import { judgeTask, remeshSuggestion } from "../internal/inspect.js";
|
|
24
|
+
import { countModelFaces, judgeFaceCount, judgeTask, remeshSuggestion } from "../internal/inspect.js";
|
|
22
25
|
import { buildLocalRuntime, buildRuntime } from "../internal/runtime.js";
|
|
23
26
|
import { extractTaskObject } from "../internal/task-view.js";
|
|
24
27
|
/** Engineering limit for a local task JSON (D-018); enforced while reading, never by truncation. */
|
|
@@ -93,15 +96,17 @@ export function readTaskJsonFile(path, opts = {}) {
|
|
|
93
96
|
return { path: abs, task: extracted.task, shape: extracted.source };
|
|
94
97
|
}
|
|
95
98
|
function resolveSource(opts) {
|
|
96
|
-
const hasFile = opts.taskJson !== undefined;
|
|
97
99
|
const hasApi = opts.resource !== undefined || opts.taskId !== undefined;
|
|
98
|
-
|
|
99
|
-
|
|
100
|
+
const given = [opts.model !== undefined, opts.taskJson !== undefined, hasApi].filter(Boolean).length;
|
|
101
|
+
if (given > 1) {
|
|
102
|
+
throw new UsageError("choose one source: --model <file>, --task-json <file>, or --resource <id> with --task-id <id> — not both");
|
|
100
103
|
}
|
|
101
|
-
if (
|
|
104
|
+
if (opts.model !== undefined)
|
|
105
|
+
return { kind: "model", path: opts.model };
|
|
106
|
+
if (opts.taskJson !== undefined)
|
|
102
107
|
return { kind: "task-json", path: opts.taskJson };
|
|
103
108
|
if (opts.resource === undefined || opts.taskId === undefined) {
|
|
104
|
-
throw new UsageError("a
|
|
109
|
+
throw new UsageError("a source is required: --model <file>, --task-json <file>, or --resource <id> together with --task-id <id>");
|
|
105
110
|
}
|
|
106
111
|
return { kind: "api", resource: opts.resource, taskId: opts.taskId };
|
|
107
112
|
}
|
|
@@ -115,63 +120,82 @@ function taskIdOf(task, fallback) {
|
|
|
115
120
|
/** Build a fresh `inspect` command tree (tests parse a new tree per run). */
|
|
116
121
|
export function buildInspectCommand() {
|
|
117
122
|
const faces = new Command("faces")
|
|
118
|
-
.description("Face-count gate: pass (exit 0) | fail (exit 12) | unknown (exit 13). Answers only whether
|
|
119
|
-
"a missing or malformed count is unknown, never 0.
|
|
123
|
+
.description("Face-count gate: pass (exit 0) | fail (exit 12) | unknown (exit 13). Answers only whether the face count <= --max-faces; " +
|
|
124
|
+
"a missing or malformed count is unknown, never 0. The API does not report face_count, so measure a downloaded model with --model. " +
|
|
125
|
+
"Never downloads a model or submits a remesh")
|
|
126
|
+
.option("--model <file>", "local .glb/.gltf: count its triangles (every mesh instance of the scene); no network, no credential")
|
|
120
127
|
.option("--task-json <file>", "saved task JSON (API task, download meta.json or v1 envelope); no network, no credential")
|
|
121
128
|
.option("--resource <id>", "task resource id (see `meshy resources`), fetched once with --task-id")
|
|
122
129
|
.option("--task-id <id>", "task id to fetch once from the API (with --resource)")
|
|
123
130
|
.option("--max-faces <n>", "maximum accepted face count (required; e.g. 300000 for rigging, 40000 for uv-unwrap — no default)", parseMaxFaces)
|
|
124
131
|
.option("--save-json <file>", "API source only: save the task JSON as received (never overwrites)")
|
|
125
132
|
.action(async (opts, thisCmd) => {
|
|
126
|
-
const opened = openCommand(thisCmd, "inspect.faces"
|
|
127
|
-
|
|
133
|
+
const opened = openCommand(thisCmd, "inspect.faces");
|
|
134
|
+
rejectOutputFlag(opened, opts.saveJson);
|
|
128
135
|
if (opts.maxFaces === undefined) {
|
|
129
136
|
throw new UsageError("--max-faces <n> is required: the limit belongs to the caller (rigging accepts up to 300000 faces, uv-unwrap up to 40000); no default is assumed");
|
|
130
137
|
}
|
|
131
138
|
const limit = opts.maxFaces;
|
|
132
139
|
const source = resolveSource(opts);
|
|
133
|
-
|
|
140
|
+
if (opts.saveJson && source.kind !== "api") {
|
|
141
|
+
throw new UsageError("--save-json only applies to the API source (--resource/--task-id)");
|
|
142
|
+
}
|
|
143
|
+
let verdict;
|
|
134
144
|
let sourceInfo;
|
|
145
|
+
let taskId = null;
|
|
146
|
+
let status = null;
|
|
135
147
|
let savedJson = null;
|
|
136
|
-
if (source.kind === "
|
|
137
|
-
if (opts.saveJson) {
|
|
138
|
-
throw new UsageError("--save-json only applies to the API source (--resource/--task-id); the task JSON is already a file");
|
|
139
|
-
}
|
|
148
|
+
if (source.kind === "model") {
|
|
140
149
|
buildLocalRuntime(opened.flags);
|
|
141
|
-
const
|
|
142
|
-
|
|
143
|
-
sourceInfo = { kind: "
|
|
150
|
+
const counted = countModelFaces(source.path);
|
|
151
|
+
verdict = judgeFaceCount(counted.triangles, limit);
|
|
152
|
+
sourceInfo = { kind: "model", path: counted.path, format: counted.format, mesh_instances: counted.mesh_instances };
|
|
144
153
|
}
|
|
145
154
|
else {
|
|
146
|
-
|
|
147
|
-
if (
|
|
148
|
-
|
|
155
|
+
let task;
|
|
156
|
+
if (source.kind === "task-json") {
|
|
157
|
+
buildLocalRuntime(opened.flags);
|
|
158
|
+
const loaded = readTaskJsonFile(source.path);
|
|
159
|
+
task = loaded.task;
|
|
160
|
+
sourceInfo = { kind: "task-json", path: loaded.path, shape: loaded.shape };
|
|
161
|
+
}
|
|
162
|
+
else {
|
|
163
|
+
const descriptor = findTaskResource(source.resource);
|
|
164
|
+
if (!descriptor) {
|
|
165
|
+
throw new UsageError(`unknown --resource '${source.resource}'. Valid ids: ${TASK_RESOURCES.map((d) => d.id).join(", ")}`);
|
|
166
|
+
}
|
|
167
|
+
const runtime = await buildRuntime(opened.flags);
|
|
168
|
+
// Exactly one GET; the verdict is read from the raw JSON, not the Zod-defaulted object.
|
|
169
|
+
const { raw } = await runtime.client.endpointFor(descriptor).retrieveDetailed(source.taskId, { signal: abortSignal() });
|
|
170
|
+
const extracted = extractTaskObject(raw);
|
|
171
|
+
task = extracted?.task ?? raw;
|
|
172
|
+
savedJson = opts.saveJson ? saveRawJson(opts.saveJson, raw, { workspace: opened.flags.workspaceRoot }) : null;
|
|
173
|
+
sourceInfo = { kind: "api", resource: descriptor.id, task_id: source.taskId, endpoint: descriptor.endpoint, requests_made: 1 };
|
|
149
174
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
const extracted = extractTaskObject(raw);
|
|
154
|
-
task = extracted?.task ?? raw;
|
|
155
|
-
savedJson = opts.saveJson ? saveRawJson(opts.saveJson, raw, { workspace: opened.flags.workspaceRoot }) : null;
|
|
156
|
-
sourceInfo = { kind: "api", resource: descriptor.id, task_id: source.taskId, endpoint: descriptor.legacyEndpoint, requests_made: 1 };
|
|
175
|
+
verdict = judgeTask(task, limit);
|
|
176
|
+
taskId = taskIdOf(task, source.kind === "api" ? source.taskId : null);
|
|
177
|
+
status = typeof task["status"] === "string" ? task["status"] : null;
|
|
157
178
|
}
|
|
158
|
-
const verdict = judgeTask(task, limit);
|
|
159
|
-
const taskId = taskIdOf(task, source.kind === "api" ? source.taskId : null);
|
|
160
179
|
const result = {
|
|
161
180
|
...verdict,
|
|
162
181
|
source: sourceInfo,
|
|
163
182
|
task_id: taskId,
|
|
164
|
-
status
|
|
165
|
-
suggestion: verdict.verdict === "fail" ? remeshSuggestion(taskId, limit) : null,
|
|
183
|
+
status,
|
|
184
|
+
suggestion: verdict.verdict === "fail" ? remeshSuggestion(source.kind === "model" ? { modelPath: source.path } : { taskId }, limit) : null,
|
|
166
185
|
saved_json: savedJson,
|
|
167
186
|
};
|
|
168
187
|
if (verdict.verdict === "fail") {
|
|
169
188
|
throw new CliError({ code: "check_failed", message: `face count check failed: ${verdict.reason}`, result: { ...result } });
|
|
170
189
|
}
|
|
171
190
|
if (verdict.verdict === "unknown") {
|
|
172
|
-
throw new CliError({
|
|
191
|
+
throw new CliError({
|
|
192
|
+
code: "check_unknown",
|
|
193
|
+
message: `face count unknown: ${verdict.reason}`,
|
|
194
|
+
hint: `the API does not report face_count; download the model and measure it: meshy inspect faces --model <file.glb> --max-faces ${limit}`,
|
|
195
|
+
result: { ...result },
|
|
196
|
+
});
|
|
173
197
|
}
|
|
174
|
-
await emitResult(opened, result
|
|
198
|
+
await emitResult(opened, result);
|
|
175
199
|
});
|
|
176
200
|
return new Command("inspect").description("Local checks on task results (face-count gate)").addCommand(faces);
|
|
177
201
|
}
|
package/dist/cmd/inspect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/cmd/inspect.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/cmd/inspect.ts"],"names":[],"mappings":"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"}
|
package/dist/cmd/make.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.d.ts","sourceRoot":"","sources":["../../src/cmd/make.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAO5C,OAAO,EAAY,KAAK,QAAQ,EAAiB,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"make.d.ts","sourceRoot":"","sources":["../../src/cmd/make.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,OAAO,EAAU,MAAM,WAAW,CAAC;AAO5C,OAAO,EAAY,KAAK,QAAQ,EAAiB,MAAM,0BAA0B,CAAC;AAQlF,OAAO,EAAc,OAAO,EAAgB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAkC,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AA0BtF,eAAO,MAAM,WAAW,SAmDpB,CAAC;AAwQL;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,GACf,MAAM,GAAG,SAAS,CAGpB;AA2DD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,CAAC"}
|
package/dist/cmd/make.js
CHANGED
|
@@ -29,20 +29,21 @@
|
|
|
29
29
|
import { Command, Option } from "commander";
|
|
30
30
|
import { basename } from "node:path";
|
|
31
31
|
import { abortSignal, noteForView, wasInterrupted } from "../internal/context.js";
|
|
32
|
-
import { CliError,
|
|
32
|
+
import { CliError, UsageError } from "../internal/errors.js";
|
|
33
33
|
import { parseInt10 } from "../internal/flags.js";
|
|
34
34
|
import { normalizeMediaPayload } from "../internal/file-input.js";
|
|
35
35
|
import { logger } from "../internal/logger.js";
|
|
36
36
|
import { planMake } from "../internal/make-plan.js";
|
|
37
|
-
import {
|
|
37
|
+
import { emitEnvelope } from "../internal/output.js";
|
|
38
38
|
import { emitResult, openCommand } from "../internal/command-helpers.js";
|
|
39
|
-
import {
|
|
39
|
+
import { downloadTaskAssets } from "../internal/download.js";
|
|
40
|
+
import { allAssetsOption, outputOption } from "../internal/global-options.js";
|
|
40
41
|
import { parseTimeoutSeconds, pollUntilTerminal } from "../internal/poll.js";
|
|
41
42
|
import { createProgress, withSpinner } from "../internal/progress.js";
|
|
42
43
|
import { PRICING_DOCS } from "../internal/pricing.js";
|
|
43
44
|
import { okEnvelope, warning } from "../internal/result.js";
|
|
44
45
|
import { buildRuntime } from "../internal/runtime.js";
|
|
45
|
-
import { buildTaskResult,
|
|
46
|
+
import { buildTaskResult, preflightOutputPath, retriedWarning, submitCreate, taskNextCommands, wrapWithResult, } from "../internal/task-command.js";
|
|
46
47
|
import { requireTaskResource } from "../client/resource-registry.js";
|
|
47
48
|
const DESCRIPTION = "Generate a 3D model in one command. A prompt runs the two-stage text flow " +
|
|
48
49
|
"(preview then refine); an image runs the single textured image-to-3d task. " +
|
|
@@ -56,8 +57,10 @@ export const makeCommand = new Command("make")
|
|
|
56
57
|
.addOption(new Option("--async", "submit the first step and return its task id immediately (no polling); later steps are reported as pending").default(false))
|
|
57
58
|
.addOption(new Option("--stop-after-first", "run the first step to completion, then return the resume plan instead of continuing").default(false))
|
|
58
59
|
.addOption(new Option("--timeout <seconds>", "max seconds to poll each step; the task keeps running after it (resume with the printed command)").default("600"))
|
|
60
|
+
.addOption(outputOption())
|
|
61
|
+
.addOption(allAssetsOption())
|
|
59
62
|
.action(async (input, opts, thisCmd) => {
|
|
60
|
-
const opened = openCommand(thisCmd, "make"
|
|
63
|
+
const opened = openCommand(thisCmd, "make");
|
|
61
64
|
if (opts.async && opts.stopAfterFirst) {
|
|
62
65
|
throw new UsageError("--async and --stop-after-first are mutually exclusive (--async submits and returns; --stop-after-first waits for step 1)");
|
|
63
66
|
}
|
|
@@ -70,12 +73,18 @@ export const makeCommand = new Command("make")
|
|
|
70
73
|
`(${describeChain(plan)}). Nothing was started.`);
|
|
71
74
|
}
|
|
72
75
|
if (opts.dryRun) {
|
|
73
|
-
await emitResult(opened,
|
|
76
|
+
await emitResult(opened, { ...planPayload(plan), dry_run: true, requests_made: 0 });
|
|
74
77
|
return;
|
|
75
78
|
}
|
|
76
79
|
await runChain(plan, opts, timeoutSeconds, await buildRuntime(opened.flags), opened);
|
|
77
80
|
});
|
|
78
|
-
|
|
81
|
+
/** The download flags a printed resume command repeats (` -o <path>` and `--all-assets`), or "". */
|
|
82
|
+
function downloadArgs(flags) {
|
|
83
|
+
if (!flags.output)
|
|
84
|
+
return "";
|
|
85
|
+
return ` -o ${flags.output}${flags.allAssets ? " --all-assets" : ""}`;
|
|
86
|
+
}
|
|
87
|
+
function pendingSteps(plan, from, parentTaskId, flags) {
|
|
79
88
|
return plan.steps.slice(from).map((s) => ({
|
|
80
89
|
step: s.index,
|
|
81
90
|
resource: s.resource,
|
|
@@ -83,7 +92,7 @@ function pendingSteps(plan, from, parentTaskId, output) {
|
|
|
83
92
|
estimated_credits: s.credits,
|
|
84
93
|
requires: `step ${s.index - 1} SUCCEEDED`,
|
|
85
94
|
command: s.resource === "text-to-3d" && s.action === "refine"
|
|
86
|
-
? `${REFINE_RESUME} ${parentTaskId ?? "<preview-task-id>"}${
|
|
95
|
+
? `${REFINE_RESUME} ${parentTaskId ?? "<preview-task-id>"}${downloadArgs(flags)}`
|
|
87
96
|
: null,
|
|
88
97
|
}));
|
|
89
98
|
}
|
|
@@ -122,30 +131,17 @@ async function runChain(plan, opts, timeoutSeconds, runtime, opened) {
|
|
|
122
131
|
const submission = { state: "accepted", operation_id: operationId, task_id: taskId };
|
|
123
132
|
if (opts.async) {
|
|
124
133
|
// Exactly one POST, zero polls: the caller owns the rest of the plan.
|
|
125
|
-
const pending = pendingSteps(plan, step.index, null, runtime.flags
|
|
126
|
-
|
|
127
|
-
await emitEnvelope(okEnvelope("make", {
|
|
128
|
-
route: plan.route,
|
|
129
|
-
submitted: { step: step.index, resource: step.resource, action: step.action, task_id: taskId, operation_id: operationId },
|
|
130
|
-
submission,
|
|
131
|
-
task: null,
|
|
132
|
-
executed,
|
|
133
|
-
pending_steps: pending,
|
|
134
|
-
estimated_credits: plan.estimatedCredits,
|
|
135
|
-
next: taskNextCommands(descriptor, taskId),
|
|
136
|
-
}, warnings), opened.format);
|
|
137
|
-
return;
|
|
138
|
-
}
|
|
139
|
-
emit({
|
|
140
|
-
command: "make",
|
|
134
|
+
const pending = pendingSteps(plan, step.index, null, runtime.flags);
|
|
135
|
+
await emitEnvelope(okEnvelope("make", {
|
|
141
136
|
route: plan.route,
|
|
142
|
-
submitted: step.action,
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
137
|
+
submitted: { step: step.index, resource: step.resource, action: step.action, task_id: taskId, operation_id: operationId },
|
|
138
|
+
submission,
|
|
139
|
+
task: null,
|
|
140
|
+
executed,
|
|
146
141
|
pending_steps: pending,
|
|
147
|
-
|
|
148
|
-
|
|
142
|
+
estimated_credits: plan.estimatedCredits,
|
|
143
|
+
next: taskNextCommands(descriptor, taskId),
|
|
144
|
+
}, warnings), opened.format);
|
|
149
145
|
return;
|
|
150
146
|
}
|
|
151
147
|
const started = performance.now();
|
|
@@ -167,7 +163,7 @@ async function runChain(plan, opts, timeoutSeconds, runtime, opened) {
|
|
|
167
163
|
task_id: taskId,
|
|
168
164
|
submission,
|
|
169
165
|
task: null,
|
|
170
|
-
pending_steps: pendingSteps(plan, step.index, null, runtime.flags
|
|
166
|
+
pending_steps: pendingSteps(plan, step.index, null, runtime.flags),
|
|
171
167
|
next: taskNextCommands(descriptor, taskId),
|
|
172
168
|
};
|
|
173
169
|
if (wasInterrupted() || abortSignal().aborted) {
|
|
@@ -201,13 +197,13 @@ async function runChain(plan, opts, timeoutSeconds, runtime, opened) {
|
|
|
201
197
|
task_id: taskId,
|
|
202
198
|
submission,
|
|
203
199
|
task: task ? buildTaskResult({ task, raw, descriptor, includeRaw: false, submission }).task : null,
|
|
204
|
-
pending_steps: pendingSteps(plan, step.index, null, runtime.flags
|
|
200
|
+
pending_steps: pendingSteps(plan, step.index, null, runtime.flags),
|
|
205
201
|
next: taskNextCommands(descriptor, taskId),
|
|
206
202
|
},
|
|
207
203
|
});
|
|
208
204
|
}
|
|
209
205
|
if (timedOut || !task || task.status !== "SUCCEEDED") {
|
|
210
|
-
throw stepFailure(plan, step, task, taskId, raw, timedOut, completedTaskId, runtime, executed
|
|
206
|
+
throw stepFailure(plan, step, task, taskId, raw, timedOut, completedTaskId, runtime, executed);
|
|
211
207
|
}
|
|
212
208
|
if (step.index === plan.steps.length) {
|
|
213
209
|
noteForView({ totalSeconds: (performance.now() - chainStarted) / 1000 });
|
|
@@ -216,26 +212,15 @@ async function runChain(plan, opts, timeoutSeconds, runtime, opened) {
|
|
|
216
212
|
}
|
|
217
213
|
completedTaskId = task.id;
|
|
218
214
|
if (opts.stopAfterFirst) {
|
|
219
|
-
const pending = pendingSteps(plan, step.index, task.id, runtime.flags
|
|
220
|
-
|
|
221
|
-
await emitEnvelope(okEnvelope("make", {
|
|
222
|
-
route: plan.route,
|
|
223
|
-
stopped_after: { step: step.index, resource: step.resource, action: step.action, task_id: task.id, status: task.status },
|
|
224
|
-
task: buildTaskResult({ task, raw, descriptor, includeRaw: false, submission }).task,
|
|
225
|
-
executed,
|
|
226
|
-
pending_steps: pending,
|
|
227
|
-
resume: resumeCommand(plan, task.id, runtime) ?? null,
|
|
228
|
-
}, warnings), opened.format);
|
|
229
|
-
return;
|
|
230
|
-
}
|
|
231
|
-
emit({
|
|
232
|
-
command: "make",
|
|
215
|
+
const pending = pendingSteps(plan, step.index, task.id, runtime.flags);
|
|
216
|
+
await emitEnvelope(okEnvelope("make", {
|
|
233
217
|
route: plan.route,
|
|
234
|
-
stopped_after: step.action,
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
218
|
+
stopped_after: { step: step.index, resource: step.resource, action: step.action, task_id: task.id, status: task.status },
|
|
219
|
+
task: buildTaskResult({ task, raw, descriptor, includeRaw: false, submission }).task,
|
|
220
|
+
executed,
|
|
221
|
+
pending_steps: pending,
|
|
222
|
+
resume: resumeCommand(plan, task.id, runtime) ?? null,
|
|
223
|
+
}, warnings), opened.format);
|
|
239
224
|
return;
|
|
240
225
|
}
|
|
241
226
|
}
|
|
@@ -243,40 +228,14 @@ async function runChain(plan, opts, timeoutSeconds, runtime, opened) {
|
|
|
243
228
|
async function finalOutcome(opened, runtime, plan, step, task, raw, elapsed, executed, warnings) {
|
|
244
229
|
const descriptor = requireTaskResource(step.resource);
|
|
245
230
|
const submission = { state: "accepted", operation_id: executed[executed.length - 1]?.operation_id ?? null, task_id: task.id };
|
|
246
|
-
if (opened.schema !== "v1") {
|
|
247
|
-
// Legacy shape, same rule as the resource commands: a download failure
|
|
248
|
-
// after the chain succeeded still names the task, its submission and the
|
|
249
|
-
// command that fetches the assets again.
|
|
250
|
-
try {
|
|
251
|
-
await emitTerminalOutcome(task, false, elapsed, step.resource, runtime);
|
|
252
|
-
}
|
|
253
|
-
catch (err) {
|
|
254
|
-
const wrapped = wrapWithResult(err, { route: plan.route, executed, task_id: task.id, submission, next: taskNextCommands(descriptor, task.id) });
|
|
255
|
-
throw new CliError({
|
|
256
|
-
code: wrapped.code,
|
|
257
|
-
message: wrapped.message,
|
|
258
|
-
exitCode: wrapped.exitCode,
|
|
259
|
-
httpStatus: wrapped.httpStatus,
|
|
260
|
-
retryable: wrapped.retryable,
|
|
261
|
-
recovery: wrapped.recovery ?? { action: "download", automatic: false, command: `meshy download --resource ${step.resource} --task-id ${task.id} --all --output-dir <dir>` },
|
|
262
|
-
hint: wrapped.hint ?? wrapped.recovery?.command ?? `meshy download --resource ${step.resource} --task-id ${task.id} --all --output-dir <dir>`,
|
|
263
|
-
details: wrapped.details,
|
|
264
|
-
warnings: wrapped.warnings,
|
|
265
|
-
result: wrapped.result,
|
|
266
|
-
cause: err,
|
|
267
|
-
});
|
|
268
|
-
}
|
|
269
|
-
return;
|
|
270
|
-
}
|
|
271
231
|
const base = buildTaskResult({ task, raw, descriptor, includeRaw: false, submission });
|
|
272
232
|
let downloads = base.downloads;
|
|
273
233
|
if (runtime.flags.output) {
|
|
274
234
|
try {
|
|
275
235
|
const output = runtime.flags.output;
|
|
276
|
-
const { files, metadataPath, materialLinks } = await withSpinner(opened.format, "Downloading assets", () =>
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
downloads = { state: "completed", files: files.map((f) => ({ key: f.key, path: f.path, status: f.status, bytes: f.bytes, sha256: f.sha256, error: f.error })), metadata_path: metadataPath, material_links: materialLinks };
|
|
236
|
+
const { files, metadataPath, materialLinks, skipped, warnings: transferWarnings } = await withSpinner(opened.format, "Downloading assets", () => downloadTaskAssets(task, output, descriptor, { root: runtime.flags.workspaceRoot, signal: abortSignal(), allAssets: runtime.flags.allAssets }));
|
|
237
|
+
warnings.push(...transferWarnings.map((w) => warning(w.code, w.message)));
|
|
238
|
+
downloads = { state: "completed", files: files.map((f) => ({ key: f.key, path: f.path, status: f.status, bytes: f.bytes, sha256: f.sha256, error: f.error })), metadata_path: metadataPath, material_links: materialLinks, skipped };
|
|
280
239
|
}
|
|
281
240
|
catch (err) {
|
|
282
241
|
// Whatever the downloader already committed stays in the manifest; the
|
|
@@ -347,46 +306,26 @@ function endpointFor(step, runtime) {
|
|
|
347
306
|
export function resumeCommand(plan, completedTaskId, runtime) {
|
|
348
307
|
if (plan.route !== "text" || !completedTaskId)
|
|
349
308
|
return undefined;
|
|
350
|
-
|
|
351
|
-
return `${REFINE_RESUME} ${completedTaskId}${output}`;
|
|
309
|
+
return `${REFINE_RESUME} ${completedTaskId}${downloadArgs(runtime.flags)}`;
|
|
352
310
|
}
|
|
353
|
-
function stepFailure(plan, step, task, taskId, raw, timedOut, completedTaskId, runtime, executed
|
|
311
|
+
function stepFailure(plan, step, task, taskId, raw, timedOut, completedTaskId, runtime, executed) {
|
|
354
312
|
const descriptor = requireTaskResource(step.resource);
|
|
355
313
|
const taskView = task ? buildTaskResult({ task, raw, descriptor, includeRaw: false, submission: { state: "accepted", operation_id: null, task_id: taskId } }).task : null;
|
|
356
314
|
const resume = resumeCommand(plan, completedTaskId, runtime);
|
|
357
315
|
const status = task?.status ?? "unknown";
|
|
358
|
-
if (opened.schema === "v1") {
|
|
359
|
-
if (timedOut) {
|
|
360
|
-
return new CliError({
|
|
361
|
-
code: "timed_out",
|
|
362
|
-
message: `make: ${step.label} did not finish within the timeout — task ${taskId} is still running`,
|
|
363
|
-
recovery: { action: "wait", automatic: false, command: `meshy ${step.resource} wait ${taskId}` },
|
|
364
|
-
result: { route: plan.route, executed, task_id: taskId, task: taskView, pending_steps: pendingSteps(plan, step.index, null, runtime.flags.output), resume: resume ?? null, next: taskNextCommands(descriptor, taskId) },
|
|
365
|
-
});
|
|
366
|
-
}
|
|
367
|
-
return new CliError({
|
|
368
|
-
code: "task_failed",
|
|
369
|
-
message: task?.task_error?.message || `make: ${step.label} ended as ${status} — task ${taskId}`,
|
|
370
|
-
recovery: resume ? { action: "resume", automatic: false, command: resume } : null,
|
|
371
|
-
result: { route: plan.route, executed, task_id: taskId, task: taskView, pending_steps: pendingSteps(plan, step.index, completedTaskId || null, runtime.flags.output), resume: resume ?? null },
|
|
372
|
-
});
|
|
373
|
-
}
|
|
374
316
|
if (timedOut) {
|
|
375
|
-
return new
|
|
317
|
+
return new CliError({
|
|
318
|
+
code: "timed_out",
|
|
376
319
|
message: `make: ${step.label} did not finish within the timeout — task ${taskId} is still running`,
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
exitCode: 8,
|
|
320
|
+
recovery: { action: "wait", automatic: false, command: `meshy ${step.resource} wait ${taskId}` },
|
|
321
|
+
result: { route: plan.route, executed, task_id: taskId, task: taskView, pending_steps: pendingSteps(plan, step.index, null, runtime.flags), resume: resume ?? null, next: taskNextCommands(descriptor, taskId) },
|
|
380
322
|
});
|
|
381
323
|
}
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
`make: ${step.label} ended as ${status} — task ${taskId}`,
|
|
388
|
-
code: "step_failed",
|
|
389
|
-
...(resume ? { hint: `${resume} # step ${step.index} failed; step ${step.index - 1} is kept` } : {}),
|
|
324
|
+
return new CliError({
|
|
325
|
+
code: "task_failed",
|
|
326
|
+
message: task?.task_error?.message || `make: ${step.label} ended as ${status} — task ${taskId}`,
|
|
327
|
+
recovery: resume ? { action: "resume", automatic: false, command: resume } : null,
|
|
328
|
+
result: { route: plan.route, executed, task_id: taskId, task: taskView, pending_steps: pendingSteps(plan, step.index, completedTaskId || null, runtime.flags), resume: resume ?? null },
|
|
390
329
|
});
|
|
391
330
|
}
|
|
392
331
|
function planPayload(plan) {
|
package/dist/cmd/make.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"make.js","sourceRoot":"","sources":["../../src/cmd/make.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"make.js","sourceRoot":"","sources":["../../src/cmd/make.ts"],"names":[],"mappings":"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"}
|
package/dist/cmd/mesh.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* mesh — local geometry helpers. No API, no credential, no network.
|
|
3
3
|
*
|
|
4
|
-
* `prepare-print`
|
|
5
|
-
* target height, XY centred, grounded at Z=0) as a streaming,
|
|
6
|
-
* command. The output file is chosen by the global `-o/--output <file>` flag:
|
|
4
|
+
* `prepare-print` turns a Meshy OBJ into a print-ready one (Y-up → Z-up,
|
|
5
|
+
* scaled to a target height, XY centred, grounded at Z=0) as a streaming,
|
|
6
|
+
* never-overwriting command. The output file is chosen by the global `-o/--output <file>` flag:
|
|
7
7
|
* Commander parses root options wherever they appear, so a second `--output`
|
|
8
8
|
* declared here would never receive the value. Without `-o` the result is
|
|
9
9
|
* `<stem>.print.obj` next to the input; `--in-place` replaces the input itself.
|
package/dist/cmd/mesh.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* mesh — local geometry helpers. No API, no credential, no network.
|
|
3
3
|
*
|
|
4
|
-
* `prepare-print`
|
|
5
|
-
* target height, XY centred, grounded at Z=0) as a streaming,
|
|
6
|
-
* command. The output file is chosen by the global `-o/--output <file>` flag:
|
|
4
|
+
* `prepare-print` turns a Meshy OBJ into a print-ready one (Y-up → Z-up,
|
|
5
|
+
* scaled to a target height, XY centred, grounded at Z=0) as a streaming,
|
|
6
|
+
* never-overwriting command. The output file is chosen by the global `-o/--output <file>` flag:
|
|
7
7
|
* Commander parses root options wherever they appear, so a second `--output`
|
|
8
8
|
* declared here would never receive the value. Without `-o` the result is
|
|
9
9
|
* `<stem>.print.obj` next to the input; `--in-place` replaces the input itself.
|
|
@@ -26,7 +26,7 @@ const prepareCommand = new Command("prepare-print")
|
|
|
26
26
|
.option("--in-place", "replace the input file itself (temp file + atomic rename); cannot be combined with -o/--output")
|
|
27
27
|
.option("--geometry-only", "never copy MTL/texture dependencies; a missing dependency becomes a warning")
|
|
28
28
|
.action(async (input, opts, thisCmd) => {
|
|
29
|
-
const opened = openCommand(thisCmd, "mesh.prepare-print"
|
|
29
|
+
const opened = openCommand(thisCmd, "mesh.prepare-print");
|
|
30
30
|
buildLocalRuntime(opened.flags);
|
|
31
31
|
const outputFlag = opened.flags.output;
|
|
32
32
|
if (outputFlag !== undefined && opts.inPlace) {
|
|
@@ -59,7 +59,7 @@ const prepareCommand = new Command("prepare-print")
|
|
|
59
59
|
geometryOnly: opts.geometryOnly,
|
|
60
60
|
root: workspace,
|
|
61
61
|
});
|
|
62
|
-
await emitResult(opened, report,
|
|
62
|
+
await emitResult(opened, report, { warnings: report.warnings });
|
|
63
63
|
});
|
|
64
64
|
export const meshCommand = new Command("mesh")
|
|
65
65
|
.description("Local mesh helpers (no API key required)")
|