@meshy-ai/cli 0.4.0 → 0.4.2

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.
Files changed (142) hide show
  1. package/.env.example +1 -1
  2. package/README.md +3 -2
  3. package/dist/client/endpoints/base.d.ts +2 -0
  4. package/dist/client/endpoints/base.d.ts.map +1 -1
  5. package/dist/client/endpoints/base.js +3 -2
  6. package/dist/client/endpoints/base.js.map +1 -1
  7. package/dist/client/errors.d.ts +9 -1
  8. package/dist/client/errors.d.ts.map +1 -1
  9. package/dist/client/errors.js +20 -0
  10. package/dist/client/errors.js.map +1 -1
  11. package/dist/client/index.d.ts +4 -4
  12. package/dist/client/index.d.ts.map +1 -1
  13. package/dist/client/index.js +4 -6
  14. package/dist/client/index.js.map +1 -1
  15. package/dist/client/resource-registry.d.ts +15 -9
  16. package/dist/client/resource-registry.d.ts.map +1 -1
  17. package/dist/client/resource-registry.js +74 -18
  18. package/dist/client/resource-registry.js.map +1 -1
  19. package/dist/client/types.d.ts +3 -0
  20. package/dist/client/types.d.ts.map +1 -1
  21. package/dist/client/types.js +5 -0
  22. package/dist/client/types.js.map +1 -1
  23. package/dist/cmd/analyze-printability.d.ts +10 -1
  24. package/dist/cmd/analyze-printability.d.ts.map +1 -1
  25. package/dist/cmd/analyze-printability.js +38 -4
  26. package/dist/cmd/analyze-printability.js.map +1 -1
  27. package/dist/cmd/animate.d.ts +5 -3
  28. package/dist/cmd/animate.d.ts.map +1 -1
  29. package/dist/cmd/animate.js +38 -9
  30. package/dist/cmd/animate.js.map +1 -1
  31. package/dist/cmd/animation-catalog.d.ts +7 -20
  32. package/dist/cmd/animation-catalog.d.ts.map +1 -1
  33. package/dist/cmd/animation-catalog.js +40 -60
  34. package/dist/cmd/animation-catalog.js.map +1 -1
  35. package/dist/cmd/auto-split.d.ts +11 -0
  36. package/dist/cmd/auto-split.d.ts.map +1 -0
  37. package/dist/cmd/auto-split.js +72 -0
  38. package/dist/cmd/auto-split.js.map +1 -0
  39. package/dist/cmd/balance.d.ts +2 -1
  40. package/dist/cmd/balance.d.ts.map +1 -1
  41. package/dist/cmd/balance.js +9 -2
  42. package/dist/cmd/balance.js.map +1 -1
  43. package/dist/cmd/convert.js +1 -1
  44. package/dist/cmd/convert.js.map +1 -1
  45. package/dist/cmd/creative-lab.d.ts +12 -6
  46. package/dist/cmd/creative-lab.d.ts.map +1 -1
  47. package/dist/cmd/creative-lab.js +118 -15
  48. package/dist/cmd/creative-lab.js.map +1 -1
  49. package/dist/cmd/delete.d.ts +4 -2
  50. package/dist/cmd/delete.d.ts.map +1 -1
  51. package/dist/cmd/delete.js +19 -4
  52. package/dist/cmd/delete.js.map +1 -1
  53. package/dist/cmd/image-to-3d.d.ts +5 -4
  54. package/dist/cmd/image-to-3d.d.ts.map +1 -1
  55. package/dist/cmd/image-to-3d.js +33 -14
  56. package/dist/cmd/image-to-3d.js.map +1 -1
  57. package/dist/cmd/image-to-image.d.ts.map +1 -1
  58. package/dist/cmd/image-to-image.js +12 -5
  59. package/dist/cmd/image-to-image.js.map +1 -1
  60. package/dist/cmd/make.d.ts.map +1 -1
  61. package/dist/cmd/make.js +8 -4
  62. package/dist/cmd/make.js.map +1 -1
  63. package/dist/cmd/multi-color-print.d.ts.map +1 -1
  64. package/dist/cmd/multi-color-print.js +12 -2
  65. package/dist/cmd/multi-color-print.js.map +1 -1
  66. package/dist/cmd/multi-image-to-3d.d.ts +6 -3
  67. package/dist/cmd/multi-image-to-3d.d.ts.map +1 -1
  68. package/dist/cmd/multi-image-to-3d.js +27 -10
  69. package/dist/cmd/multi-image-to-3d.js.map +1 -1
  70. package/dist/cmd/remesh.d.ts.map +1 -1
  71. package/dist/cmd/remesh.js +5 -3
  72. package/dist/cmd/remesh.js.map +1 -1
  73. package/dist/cmd/repair-printability.d.ts +2 -1
  74. package/dist/cmd/repair-printability.d.ts.map +1 -1
  75. package/dist/cmd/repair-printability.js +14 -5
  76. package/dist/cmd/repair-printability.js.map +1 -1
  77. package/dist/cmd/resize.js +1 -1
  78. package/dist/cmd/resize.js.map +1 -1
  79. package/dist/cmd/resources.d.ts +1 -1
  80. package/dist/cmd/resources.d.ts.map +1 -1
  81. package/dist/cmd/resources.js +8 -6
  82. package/dist/cmd/resources.js.map +1 -1
  83. package/dist/cmd/retexture.d.ts.map +1 -1
  84. package/dist/cmd/retexture.js +6 -4
  85. package/dist/cmd/retexture.js.map +1 -1
  86. package/dist/cmd/rigging.d.ts +0 -1
  87. package/dist/cmd/rigging.d.ts.map +1 -1
  88. package/dist/cmd/rigging.js +2 -2
  89. package/dist/cmd/rigging.js.map +1 -1
  90. package/dist/cmd/text-to-3d.d.ts +5 -6
  91. package/dist/cmd/text-to-3d.d.ts.map +1 -1
  92. package/dist/cmd/text-to-3d.js +45 -20
  93. package/dist/cmd/text-to-3d.js.map +1 -1
  94. package/dist/cmd/text-to-image.d.ts.map +1 -1
  95. package/dist/cmd/text-to-image.js +3 -1
  96. package/dist/cmd/text-to-image.js.map +1 -1
  97. package/dist/cmd/usage.d.ts +10 -0
  98. package/dist/cmd/usage.d.ts.map +1 -0
  99. package/dist/cmd/usage.js +61 -0
  100. package/dist/cmd/usage.js.map +1 -0
  101. package/dist/internal/artifacts.d.ts +1 -0
  102. package/dist/internal/artifacts.d.ts.map +1 -1
  103. package/dist/internal/artifacts.js +4 -0
  104. package/dist/internal/artifacts.js.map +1 -1
  105. package/dist/internal/command-helpers.d.ts +2 -0
  106. package/dist/internal/command-helpers.d.ts.map +1 -1
  107. package/dist/internal/command-helpers.js +8 -0
  108. package/dist/internal/command-helpers.js.map +1 -1
  109. package/dist/internal/device.d.ts +1 -1
  110. package/dist/internal/device.js +3 -3
  111. package/dist/internal/device.js.map +1 -1
  112. package/dist/internal/errors.d.ts +2 -1
  113. package/dist/internal/errors.d.ts.map +1 -1
  114. package/dist/internal/errors.js +6 -1
  115. package/dist/internal/errors.js.map +1 -1
  116. package/dist/internal/file-input.d.ts.map +1 -1
  117. package/dist/internal/file-input.js +18 -16
  118. package/dist/internal/file-input.js.map +1 -1
  119. package/dist/internal/image-models.d.ts +2 -3
  120. package/dist/internal/image-models.d.ts.map +1 -1
  121. package/dist/internal/image-models.js +3 -3
  122. package/dist/internal/image-models.js.map +1 -1
  123. package/dist/internal/poll.d.ts +16 -1
  124. package/dist/internal/poll.d.ts.map +1 -1
  125. package/dist/internal/poll.js +41 -9
  126. package/dist/internal/poll.js.map +1 -1
  127. package/dist/internal/task-command.d.ts +17 -1
  128. package/dist/internal/task-command.d.ts.map +1 -1
  129. package/dist/internal/task-command.js +52 -8
  130. package/dist/internal/task-command.js.map +1 -1
  131. package/dist/internal/views.d.ts.map +1 -1
  132. package/dist/internal/views.js +7 -1
  133. package/dist/internal/views.js.map +1 -1
  134. package/dist/root.d.ts.map +1 -1
  135. package/dist/root.js +7 -2
  136. package/dist/root.js.map +1 -1
  137. package/package.json +2 -2
  138. package/skills/meshy-cli/SKILL.md +67 -40
  139. package/dist/client/endpoints/animation-catalog.d.ts +0 -37
  140. package/dist/client/endpoints/animation-catalog.d.ts.map +0 -1
  141. package/dist/client/endpoints/animation-catalog.js +0 -55
  142. package/dist/client/endpoints/animation-catalog.js.map +0 -1
@@ -2,14 +2,15 @@
2
2
  * image-to-3d — https://docs.meshy.ai/en/api/image-to-3d
3
3
  *
4
4
  * The mode IS the model — there is no model flag:
5
- * - standard → meshy-7 (server default "latest") — full-detail generation;
6
- * polycount is remesh's job afterwards.
5
+ * - standard → meshy-7.1 (server default "latest") — full-detail
6
+ * generation; polycount is remesh's job afterwards.
7
7
  * - smart-topology → meshy-t2 (server default) — component-aware low-poly
8
8
  * with a native --target-polycount; the budget pick for game-ready
9
9
  * geometry.
10
10
  *
11
- * --ultra-mode rides on standard only: the API gates ultra_mode on meshy-7,
12
- * so pairing it with smart-topology is rejected here rather than on the wire.
11
+ * The Ultra geometry pass (--geometry-resolution 2k|4k, or the deprecated
12
+ * --ultra-mode) rides on standard only: it needs meshy-7.1, so pairing it with
13
+ * smart-topology is rejected here rather than on the wire.
13
14
  */
14
15
  import { Option } from "commander";
15
16
  import { parseBool, parseCsv, parseInt10 } from "../internal/flags.js";
@@ -28,16 +29,17 @@ const spec = {
28
29
  return cmd
29
30
  .option("--image-url <src>", "reference image; http(s) URL or local file path")
30
31
  .option("--input-task-id <id>", "alternative to --image-url: a SUCCEEDED text-to-image or image-to-image task whose output becomes the source image")
31
- .addOption(new Option("--model-type <kind>", "standard (default; meshy-7 full-detail generation) | smart-topology (meshy-t2 component-aware low-poly: clean topology, separated parts)").choices(["standard", "smart-topology"]))
32
+ .addOption(new Option("--model-type <kind>", "standard (default; meshy-7.1 full-detail generation) | smart-topology (meshy-t2 component-aware low-poly: clean topology, separated parts)").choices(["standard", "smart-topology"]))
32
33
  .option("--target-polycount <n>", "smart-topology only: target triangle count, 100-15000 (default: 10000). For standard outputs use remesh", parseInt10)
33
- .option("--ultra-mode <bool>", "standard mode only: extra Meshy 7 pass for finer surface detail (default: false; billed on top of the mesh)", parseBool)
34
+ .addOption(new Option("--geometry-resolution <res>", "standard mode only: standard (default) | 2k | 4k — the Ultra geometry pass at 2048³ / 4096³ for finer surface detail (needs meshy-7.1 / latest, the default; billed on top of the mesh)").choices(["standard", "2k", "4k"]))
35
+ .option("--ultra-mode <bool>", "deprecated: use --geometry-resolution 2k (true is the same pass)", parseBool)
34
36
  .option("--should-texture <bool>", "generate textures (default: false — draft white mesh, the preview stage; texture later with retexture)", parseBool)
35
- .option("--enable-pbr <bool>", "generate normal/metallic/roughness/emission maps (default: true, so game-engine imports carry the full map set)", parseBool)
36
- .option("--texture-prompt <text>", "text guidance for texturing (max 600 chars)")
37
+ .option("--enable-pbr <bool>", "generate normal/metallic/roughness maps, plus an emission map on meshy-6 below 8k (default: true, so game-engine imports carry the full map set)", parseBool)
38
+ .option("--texture-prompt <text>", "text guidance for texturing (max 800 chars)")
37
39
  .addOption(new Option("--texture-resolution <res>", "base color texture size (default: 4k)").choices(["2k", "4k", "8k"]))
38
40
  .addOption(new Option("--pose-mode <pose>", "a-pose | t-pose pre-pose characters for rigging; auto (default) lets the model decide").choices(["a-pose", "t-pose", "auto"]))
39
41
  .option("--image-enhancement <bool>", "optimize the input image before processing (default: true)", parseBool)
40
- .option("--remove-lighting <bool>", "strip baked lighting from the base color (default: true)", parseBool)
42
+ .option("--remove-lighting <bool>", "strip baked lighting from the base color; the API applies it on meshy-6 only (--data '{\"ai_model\":\"meshy-6\"}') — the default Meshy 7.1 does not use it and smart-topology refuses it", parseBool)
41
43
  .option("--target-formats <csv>", "glb,obj,fbx,stl,usdz,3mf (default: glb)", parseCsv);
42
44
  },
43
45
  toPayload(opts) {
@@ -48,9 +50,15 @@ const spec = {
48
50
  if (opts.targetPolycount != null && !smart) {
49
51
  throw new UsageError("--target-polycount applies to --model-type smart-topology only; for standard outputs chain `remesh` afterwards");
50
52
  }
51
- // ultra_mode is gated on meshy-7, which only standard mode resolves to.
53
+ // The Ultra pass needs meshy-7.1, which only standard mode resolves to.
52
54
  if (opts.ultraMode === true && smart) {
53
- throw new UsageError("--ultra-mode applies to --model-type standard only (it needs meshy-7; smart-topology runs meshy-t2)");
55
+ throw new UsageError("--ultra-mode applies to --model-type standard only (it needs meshy-7.1; smart-topology runs meshy-t2)");
56
+ }
57
+ if (smart && opts.geometryResolution !== undefined && opts.geometryResolution !== "standard") {
58
+ throw new UsageError("--geometry-resolution 2k/4k applies to --model-type standard only (it needs meshy-7.1; smart-topology runs meshy-t2)");
59
+ }
60
+ if (opts.ultraMode !== undefined && opts.geometryResolution !== undefined) {
61
+ throw new UsageError("--ultra-mode is the deprecated spelling of --geometry-resolution 2k; pass only --geometry-resolution");
54
62
  }
55
63
  // The API rejects texture knobs on untextured runs; catch it before the wire.
56
64
  if (opts.shouldTexture !== true && !opts.data) {
@@ -70,6 +78,7 @@ const spec = {
70
78
  model_type: opts.modelType,
71
79
  target_polycount: opts.targetPolycount,
72
80
  ultra_mode: opts.ultraMode,
81
+ geometry_resolution: opts.geometryResolution,
73
82
  should_texture: opts.shouldTexture,
74
83
  enable_pbr: opts.enablePbr,
75
84
  texture_prompt: opts.texturePrompt,
@@ -86,10 +95,10 @@ const spec = {
86
95
  // texturing is its own step, and the API rejects texture knobs on
87
96
  // untextured runs, so they ride only when texturing is on — then the
88
97
  // game-ready defaults apply: full PBR map set, 4k base color. The
89
- // model is not a choice — it follows the mode (standard → meshy-7,
98
+ // model is not a choice — it follows the mode (standard → meshy-7.1,
90
99
  // smart-topology → meshy-t2, both server defaults). Smart topology
91
- // gets the rigging-friendly 10k polycount. ultra_mode stays off unless
92
- // asked for: it bills extra. GLB-only output — omitting target_formats
100
+ // gets the rigging-friendly 10k polycount. The Ultra pass stays off
101
+ // unless asked for: it bills extra. GLB-only output — omitting target_formats
93
102
  // makes the API produce every format.
94
103
  const texturing = opts.shouldTexture === true;
95
104
  return {
@@ -100,6 +109,16 @@ const spec = {
100
109
  target_formats: ["glb"],
101
110
  };
102
111
  },
112
+ validatePayload(payload) {
113
+ // meshy-t2 has neither knob; v1 answers 400 for either (it does not ignore them).
114
+ if (payload.model_type === "smart-topology") {
115
+ for (const [flag, key] of [["--remove-lighting", "remove_lighting"], ["--image-enhancement", "image_enhancement"]]) {
116
+ if (payload[key] !== undefined) {
117
+ throw new UsageError(`${flag} applies to --model-type standard only (smart-topology runs meshy-t2, which the API refuses it for)`);
118
+ }
119
+ }
120
+ }
121
+ },
103
122
  },
104
123
  endpointOf: (c) => c.imageTo3d,
105
124
  };
@@ -1 +1 @@
1
- {"version":3,"file":"image-to-3d.js","sourceRoot":"","sources":["../../src/cmd/image-to-3d.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"image-to-3d.js","sourceRoot":"","sources":["../../src/cmd/image-to-3d.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"image-to-image.d.ts","sourceRoot":"","sources":["../../src/cmd/image-to-image.ts"],"names":[],"mappings":"AAAA;;GAEG;AA0EH,eAAO,MAAM,mBAAmB,6BAA6B,CAAC"}
1
+ {"version":3,"file":"image-to-image.d.ts","sourceRoot":"","sources":["../../src/cmd/image-to-image.ts"],"names":[],"mappings":"AAAA;;GAEG;AAoFH,eAAO,MAAM,mBAAmB,6BAA6B,CAAC"}
@@ -8,8 +8,8 @@ import { ASPECT_RATIOS, ASPECT_RATIO_HELP, DEFAULT_IMAGE_MODEL, IMAGE_MODELS, IM
8
8
  import { buildResourceCommand } from "../internal/task-command.js";
9
9
  const spec = {
10
10
  name: "image-to-image",
11
- description: "Instruction-driven image editing and generation from 1-5 reference images — extraction, " +
12
- "transformation, combination, restyling",
11
+ description: "Instruction-driven image editing and generation from 1-5 reference images (or a previous " +
12
+ "image task's output) — extraction, transformation, combination, restyling",
13
13
  create: {
14
14
  description: "Create an image-to-image task",
15
15
  configure(cmd) {
@@ -18,18 +18,23 @@ const spec = {
18
18
  .option("--prompt <text>", "required — a straightforward, specific instruction, e.g. 'Extract the person on the " +
19
19
  "left onto a clean white background' or 'Restyle into chibi cartoon style'. With " +
20
20
  "multiple references say 'the first image', 'the second image', ...")
21
- .option("--reference-image-urls <csv>", "required — 1-5 reference images as CSV; each entry is a URL or local file path", parseCsv)
21
+ .option("--reference-image-urls <csv>", "1-5 reference images as CSV; each entry is a URL or local file path (required unless --input-task-id)", parseCsv)
22
+ .option("--input-task-id <id>", "alternative to --reference-image-urls: a SUCCEEDED text-to-image or image-to-image task whose output images become the references (takes priority)")
22
23
  .option("--generate-multi-view <bool>", "generate multi-angle views of the subject; mutually exclusive with --aspect-ratio", parseBool)
23
- .addOption(new Option("--aspect-ratio <ratio>", ASPECT_RATIO_HELP).choices([...ASPECT_RATIOS]));
24
+ .addOption(new Option("--aspect-ratio <ratio>", ASPECT_RATIO_HELP).choices([...ASPECT_RATIOS]))
25
+ .option("--remove-background <bool>", "return a transparent RGBA PNG with the background removed (default: false)", parseBool);
24
26
  },
25
27
  toPayload(opts) {
26
28
  if (!opts.prompt && !opts.data) {
27
29
  throw new UsageError("--prompt is required");
28
30
  }
29
31
  const urls = opts.referenceImageUrls;
30
- if ((!urls || urls.length < 1 || urls.length > 5) && !opts.data) {
32
+ if (urls && (urls.length < 1 || urls.length > 5)) {
31
33
  throw new UsageError("--reference-image-urls must be a CSV of 1-5 URLs");
32
34
  }
35
+ if (!urls && !opts.inputTaskId && !opts.data) {
36
+ throw new UsageError("provide --reference-image-urls (CSV of 1-5) or --input-task-id");
37
+ }
33
38
  checkImageCombo({
34
39
  // With --data in play an unset flag may be supplied there; leave the
35
40
  // ratio check to the server rather than validating against a model
@@ -42,8 +47,10 @@ const spec = {
42
47
  ai_model: opts.aiModel,
43
48
  prompt: opts.prompt,
44
49
  reference_image_urls: urls,
50
+ input_task_id: opts.inputTaskId,
45
51
  generate_multi_view: opts.generateMultiView,
46
52
  aspect_ratio: opts.aspectRatio,
53
+ remove_background: opts.removeBackground,
47
54
  };
48
55
  },
49
56
  toDefaults() {
@@ -1 +1 @@
1
- {"version":3,"file":"image-to-image.js","sourceRoot":"","sources":["../../src/cmd/image-to-image.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,eAAe,GAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAE7F,MAAM,IAAI,GAAwB;IAChC,IAAI,EAAE,gBAAgB;IACtB,WAAW,EACT,0FAA0F;QAC1F,wCAAwC;IAC1C,MAAM,EAAE;QACN,WAAW,EAAE,+BAA+B;QAC5C,SAAS,CAAC,GAAG;YACX,OAAO,GAAG;iBACP,SAAS,CAAC,IAAI,MAAM,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;iBACxF,MAAM,CACL,iBAAiB,EACjB,sFAAsF;gBACpF,kFAAkF;gBAClF,oEAAoE,CACvE;iBACA,MAAM,CACL,8BAA8B,EAC9B,gFAAgF,EAChF,QAAQ,CACT;iBACA,MAAM,CACL,8BAA8B,EAC9B,mFAAmF,EACnF,SAAS,CACV;iBACA,SAAS,CAAC,IAAI,MAAM,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;QACpG,CAAC;QACD,SAAS,CAAC,IAAI;YACZ,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAC/B,MAAM,IAAI,UAAU,CAAC,sBAAsB,CAAC,CAAC;YAC/C,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,kBAA0C,CAAC;YAC7D,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAChE,MAAM,IAAI,UAAU,CAAC,kDAAkD,CAAC,CAAC;YAC3E,CAAC;YACD,eAAe,CAAC;gBACd,qEAAqE;gBACrE,mEAAmE;gBACnE,yBAAyB;gBACzB,OAAO,EAAG,IAAI,CAAC,OAA8B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC;gBAC9F,WAAW,EAAE,IAAI,CAAC,WAAiC;gBACnD,iBAAiB,EAAE,IAAI,CAAC,iBAAwC;aACjE,CAAC,CAAC;YACH,OAAO;gBACL,QAAQ,EAAE,IAAI,CAAC,OAAO;gBACtB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,oBAAoB,EAAE,IAAI;gBAC1B,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;gBAC3C,YAAY,EAAE,IAAI,CAAC,WAAW;aAC/B,CAAC;QACJ,CAAC;QACD,UAAU;YACR,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;QAC3C,CAAC;KACF;IACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY;CAClC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"image-to-image.js","sourceRoot":"","sources":["../../src/cmd/image-to-image.ts"],"names":[],"mappings":"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"}
@@ -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;AAOlF,OAAO,EAAc,OAAO,EAAgB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAgB,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AA0BpE,eAAO,MAAM,WAAW,SAiDpB,CAAC;AAoTL;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,GACf,MAAM,GAAG,SAAS,CAIpB;AAgFD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,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;AAOlF,OAAO,EAAc,OAAO,EAAgB,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAgB,KAAK,OAAO,EAAE,MAAM,wBAAwB,CAAC;AA2BpE,eAAO,MAAM,WAAW,SAiDpB,CAAC;AAwTL;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,GACf,MAAM,GAAG,SAAS,CAIpB;AAgFD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,CAAC"}
package/dist/cmd/make.js CHANGED
@@ -42,7 +42,7 @@ import { createProgress, withSpinner } from "../internal/progress.js";
42
42
  import { PRICING_DOCS } from "../internal/pricing.js";
43
43
  import { okEnvelope, warning } from "../internal/result.js";
44
44
  import { buildRuntime } from "../internal/runtime.js";
45
- import { buildTaskResult, emitTerminalOutcome, preflightOutputPath, submitCreate, taskNextCommands, wrapWithResult, } from "../internal/task-command.js";
45
+ import { buildTaskResult, emitTerminalOutcome, preflightOutputPath, retriedWarning, submitCreate, taskNextCommands, wrapWithResult, } from "../internal/task-command.js";
46
46
  import { requireTaskResource } from "../client/resource-registry.js";
47
47
  const DESCRIPTION = "Generate a 3D model in one command. A prompt runs the two-stage text flow " +
48
48
  "(preview then refine); an image runs the single textured image-to-3d task. " +
@@ -55,7 +55,7 @@ export const makeCommand = new Command("make")
55
55
  .argParser(parseInt10))
56
56
  .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
57
  .addOption(new Option("--stop-after-first", "run the first step to completion, then return the resume plan instead of continuing").default(false))
58
- .addOption(new Option("--timeout <seconds>", "max seconds to poll each step").default("600"))
58
+ .addOption(new Option("--timeout <seconds>", "max seconds to poll each step; the task keeps running after it (resume with the printed command)").default("600"))
59
59
  .action(async (input, opts, thisCmd) => {
60
60
  const opened = openCommand(thisCmd, "make", "legacy");
61
61
  if (opts.async && opts.stopAfterFirst) {
@@ -83,7 +83,7 @@ function pendingSteps(plan, from, parentTaskId, output) {
83
83
  estimated_credits: s.credits,
84
84
  requires: `step ${s.index - 1} SUCCEEDED`,
85
85
  command: s.resource === "text-to-3d" && s.action === "refine"
86
- ? `meshy text-to-3d create --mode refine --preview-task-id ${parentTaskId ?? "<preview-task-id>"}${output ? ` -o ${output}` : ""}`
86
+ ? `${REFINE_RESUME} ${parentTaskId ?? "<preview-task-id>"}${output ? ` -o ${output}` : ""}`
87
87
  : null,
88
88
  }));
89
89
  }
@@ -182,6 +182,8 @@ async function runChain(plan, opts, timeoutSeconds, runtime, opened) {
182
182
  throw wrapWithResult(err, context);
183
183
  }
184
184
  const { task, raw, timedOut, aborted } = poll;
185
+ if (poll.lastError)
186
+ warnings.push(retriedWarning(poll));
185
187
  const elapsed = (performance.now() - started) / 1000;
186
188
  executed[executed.length - 1].status = task?.status ?? null;
187
189
  if (aborted)
@@ -297,6 +299,8 @@ async function finalOutcome(opened, runtime, plan, step, task, raw, elapsed, exe
297
299
  }
298
300
  await emitEnvelope(okEnvelope("make", { route: plan.route, executed, task: base.task, submission: base.submission, downloads, pending_steps: [] }, warnings), opened.format);
299
301
  }
302
+ /** make's refine asks for 4k (its preview runs on latest); the resume command asks for the same. */
303
+ const REFINE_RESUME = "meshy text-to-3d create --mode refine --texture-resolution 4k --preview-task-id";
300
304
  /**
301
305
  * One payload builder per step, taking the previous step's task id so the
302
306
  * chain stays a function of the plan plus what actually ran.
@@ -344,7 +348,7 @@ export function resumeCommand(plan, completedTaskId, runtime) {
344
348
  if (plan.route !== "text" || !completedTaskId)
345
349
  return undefined;
346
350
  const output = runtime.flags.output ? ` -o ${runtime.flags.output}` : "";
347
- return `meshy text-to-3d create --mode refine --preview-task-id ${completedTaskId}${output}`;
351
+ return `${REFINE_RESUME} ${completedTaskId}${output}`;
348
352
  }
349
353
  function stepFailure(plan, step, task, taskId, raw, timedOut, completedTaskId, runtime, executed, opened) {
350
354
  const descriptor = requireTaskResource(step.resource);
@@ -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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"}
@@ -1 +1 @@
1
- {"version":3,"file":"multi-color-print.d.ts","sourceRoot":"","sources":["../../src/cmd/multi-color-print.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA8CH,eAAO,MAAM,sBAAsB,6BAA6B,CAAC"}
1
+ {"version":3,"file":"multi-color-print.d.ts","sourceRoot":"","sources":["../../src/cmd/multi-color-print.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+DH,eAAO,MAAM,sBAAsB,6BAA6B,CAAC"}
@@ -2,6 +2,7 @@
2
2
  * multi-color-print — https://docs.meshy.ai/en/api/multi-color-print
3
3
  * Converts a SUCCEEDED 3D task into a multi-color 3MF print file.
4
4
  */
5
+ import { Option } from "commander";
5
6
  import { parseInt10 } from "../internal/flags.js";
6
7
  import { UsageError } from "../internal/errors.js";
7
8
  import { buildResourceCommand } from "../internal/task-command.js";
@@ -14,9 +15,13 @@ const spec = {
14
15
  configure(cmd) {
15
16
  return cmd
16
17
  .option("--input-task-id <id>", "SUCCEEDED source task (image-to-3d, multi-image-to-3d, text-to-3d, remesh, or retexture) — takes priority over --model-url")
17
- .option("--model-url <src>", "3D model as http(s) URL or local file path (.glb/.fbx)")
18
+ .option("--model-url <src>", "3D model: an http(s) URL (.glb/.fbx) or a local .glb file — the API takes an inline upload as GLB only here, so host .fbx at a URL")
18
19
  .option("--max-colors <n>", "1-16 (default: 4)", parseInt10)
19
- .option("--max-depth <n>", "quadtree depth 3-6 (default: 4)", parseInt10);
20
+ .addOption(new Option("--style <style>", "realistic (default; colours sampled from the texture) | cartoon (flat regions, smaller file; also takes vertex colours)").choices(["realistic", "cartoon"]))
21
+ .option("--max-depth <n>", "realistic only: quadtree depth 3-6 (default: 4)", parseInt10)
22
+ .addOption(new Option("--printer-brand <brand>", "slicer preset written into the 3MF (default: bambu)").choices([
23
+ "bambu", "anycubic", "creality", "elegoo", "flashforge", "prusa", "qidi", "snapmaker", "ankermake",
24
+ ]));
20
25
  },
21
26
  toPayload(opts) {
22
27
  if (!opts.inputTaskId && !opts.modelUrl && !opts.data) {
@@ -30,11 +35,16 @@ const spec = {
30
35
  if (maxDepth !== undefined && (maxDepth < 3 || maxDepth > 6)) {
31
36
  throw new UsageError("--max-depth must be between 3 and 6");
32
37
  }
38
+ if (maxDepth !== undefined && opts.style === "cartoon") {
39
+ throw new UsageError("--max-depth applies to --style realistic only");
40
+ }
33
41
  return {
34
42
  input_task_id: opts.inputTaskId,
35
43
  model_url: opts.modelUrl,
36
44
  max_colors: maxColors,
45
+ style: opts.style,
37
46
  max_depth: maxDepth,
47
+ printer_brand: opts.printerBrand,
38
48
  };
39
49
  },
40
50
  },
@@ -1 +1 @@
1
- {"version":3,"file":"multi-color-print.js","sourceRoot":"","sources":["../../src/cmd/multi-color-print.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAE7F,MAAM,IAAI,GAAwB;IAChC,IAAI,EAAE,mBAAmB;IACzB,WAAW,EACT,sFAAsF;QACtF,kCAAkC;IACpC,MAAM,EAAE;QACN,WAAW,EAAE,iCAAiC;QAC9C,SAAS,CAAC,GAAG;YACX,OAAO,GAAG;iBACP,MAAM,CACL,sBAAsB,EACtB,4HAA4H,CAC7H;iBACA,MAAM,CAAC,mBAAmB,EAAE,wDAAwD,CAAC;iBACrF,MAAM,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,UAAU,CAAC;iBAC3D,MAAM,CAAC,iBAAiB,EAAE,iCAAiC,EAAE,UAAU,CAAC,CAAC;QAC9E,CAAC;QACD,SAAS,CAAC,IAAI;YACZ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtD,MAAM,IAAI,UAAU,CAAC,wCAAwC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,SAA+B,CAAC;YACvD,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,UAAU,CAAC,uCAAuC,CAAC,CAAC;YAChE,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAA8B,CAAC;YACrD,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC7D,MAAM,IAAI,UAAU,CAAC,qCAAqC,CAAC,CAAC;YAC9D,CAAC;YACD,OAAO;gBACL,aAAa,EAAE,IAAI,CAAC,WAAW;gBAC/B,SAAS,EAAE,IAAI,CAAC,QAAQ;gBACxB,UAAU,EAAE,SAAS;gBACrB,SAAS,EAAE,QAAQ;aACpB,CAAC;QACJ,CAAC;KACF;IACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe;CACrC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"multi-color-print.js","sourceRoot":"","sources":["../../src/cmd/multi-color-print.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAE7F,MAAM,IAAI,GAAwB;IAChC,IAAI,EAAE,mBAAmB;IACzB,WAAW,EACT,sFAAsF;QACtF,kCAAkC;IACpC,MAAM,EAAE;QACN,WAAW,EAAE,iCAAiC;QAC9C,SAAS,CAAC,GAAG;YACX,OAAO,GAAG;iBACP,MAAM,CACL,sBAAsB,EACtB,4HAA4H,CAC7H;iBACA,MAAM,CAAC,mBAAmB,EAAE,oIAAoI,CAAC;iBACjK,MAAM,CAAC,kBAAkB,EAAE,mBAAmB,EAAE,UAAU,CAAC;iBAC3D,SAAS,CACR,IAAI,MAAM,CACR,iBAAiB,EACjB,yHAAyH,CAC1H,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CACpC;iBACA,MAAM,CAAC,iBAAiB,EAAE,iDAAiD,EAAE,UAAU,CAAC;iBACxF,SAAS,CACR,IAAI,MAAM,CAAC,yBAAyB,EAAE,qDAAqD,CAAC,CAAC,OAAO,CAAC;gBACnG,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW;aACnG,CAAC,CACH,CAAC;QACN,CAAC;QACD,SAAS,CAAC,IAAI;YACZ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtD,MAAM,IAAI,UAAU,CAAC,wCAAwC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,SAAS,GAAG,IAAI,CAAC,SAA+B,CAAC;YACvD,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC;gBACjE,MAAM,IAAI,UAAU,CAAC,uCAAuC,CAAC,CAAC;YAChE,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAA8B,CAAC;YACrD,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC7D,MAAM,IAAI,UAAU,CAAC,qCAAqC,CAAC,CAAC;YAC9D,CAAC;YACD,IAAI,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBACvD,MAAM,IAAI,UAAU,CAAC,+CAA+C,CAAC,CAAC;YACxE,CAAC;YACD,OAAO;gBACL,aAAa,EAAE,IAAI,CAAC,WAAW;gBAC/B,SAAS,EAAE,IAAI,CAAC,QAAQ;gBACxB,UAAU,EAAE,SAAS;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,SAAS,EAAE,QAAQ;gBACnB,aAAa,EAAE,IAAI,CAAC,YAAY;aACjC,CAAC;QACJ,CAAC;KACF;IACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe;CACrC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC"}
@@ -1,9 +1,12 @@
1
1
  /**
2
2
  * multi-image-to-3d — https://docs.meshy.ai/en/api/multi-image-to-3d
3
3
  *
4
- * No model flag, same as the other 3D generation commands: the server default
5
- * "latest" applies, which is meshy-7 here. Note ultra_mode does NOT exist on
6
- * this endpoint (the API silently ignores it) — it is single-image only.
4
+ * No model flag, same as the other 3D generation commands: the API default
5
+ * "latest" is Meshy 7.1. geometry_resolution "2k" runs the Ultra pass (+5
6
+ * credits; the same geometry setting as the web app's Ultra 2K) and needs
7
+ * meshy-7.1 / latest; the deprecated ultra_mode boolean is its old spelling.
8
+ * "4k" is single-image only — the API refuses it here. Only the enum is
9
+ * exposed; ai_model and ultra_mode stay reachable through --data.
7
10
  */
8
11
  export declare const multiImageTo3dCommand: import("commander").Command;
9
12
  //# sourceMappingURL=multi-image-to-3d.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"multi-image-to-3d.d.ts","sourceRoot":"","sources":["../../src/cmd/multi-image-to-3d.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkGH,eAAO,MAAM,qBAAqB,6BAA6B,CAAC"}
1
+ {"version":3,"file":"multi-image-to-3d.d.ts","sourceRoot":"","sources":["../../src/cmd/multi-image-to-3d.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAyHH,eAAO,MAAM,qBAAqB,6BAA6B,CAAC"}
@@ -1,9 +1,12 @@
1
1
  /**
2
2
  * multi-image-to-3d — https://docs.meshy.ai/en/api/multi-image-to-3d
3
3
  *
4
- * No model flag, same as the other 3D generation commands: the server default
5
- * "latest" applies, which is meshy-7 here. Note ultra_mode does NOT exist on
6
- * this endpoint (the API silently ignores it) — it is single-image only.
4
+ * No model flag, same as the other 3D generation commands: the API default
5
+ * "latest" is Meshy 7.1. geometry_resolution "2k" runs the Ultra pass (+5
6
+ * credits; the same geometry setting as the web app's Ultra 2K) and needs
7
+ * meshy-7.1 / latest; the deprecated ultra_mode boolean is its old spelling.
8
+ * "4k" is single-image only — the API refuses it here. Only the enum is
9
+ * exposed; ai_model and ultra_mode stay reachable through --data.
7
10
  */
8
11
  import { Option } from "commander";
9
12
  import { parseBool, parseCsv } from "../internal/flags.js";
@@ -11,19 +14,22 @@ import { UsageError } from "../internal/errors.js";
11
14
  import { buildResourceCommand } from "../internal/task-command.js";
12
15
  const spec = {
13
16
  name: "multi-image-to-3d",
14
- description: "Generate a 3D model from 1-4 viewpoint images of a single object. Beta and unstable — " +
15
- "prefer image-to-3d unless multi-view input is explicitly required. Each input must be a " +
16
- "separate single-view image, never one grid/collage. Topology/polycount are not tunable " +
17
- "here — chain `remesh` afterwards",
17
+ description: "Generate a 3D model from 1-4 viewpoint images of a single object (Meshy 7.1 by default; " +
18
+ "prefer image-to-3d unless multi-view input is explicitly required). Each input must be a " +
19
+ "separate single-view image, never one grid/collage. --geometry-resolution 2k turns on " +
20
+ "the Ultra pass (the web app's Ultra 2K geometry setting). Topology/polycount " +
21
+ "are not tunable here — chain `remesh` afterwards",
18
22
  create: {
19
23
  description: "Create a multi-image-to-3d task",
20
24
  configure(cmd) {
21
25
  return cmd
22
26
  .option("--image-urls <csv>", "1-4 reference images as CSV, ideally front/side/back; each entry is a URL or local file path", parseCsv)
23
27
  .option("--input-task-id <id>", "alternative to --image-urls: a SUCCEEDED text-to-image or image-to-image task (e.g. multi-view output) whose images become the source views")
28
+ .addOption(new Option("--geometry-resolution <res>", "geometry pass: standard (default) | 2k (the Ultra pass at 2048³, the web app's Ultra 2K setting; billed on top of the mesh)").choices(["standard", "2k"]))
24
29
  .option("--should-texture <bool>", "generate textures (default: false — draft white mesh; texture later with retexture)", parseBool)
25
- .option("--enable-pbr <bool>", "generate normal/metallic/roughness/emission maps (default: true, so game-engine imports carry the full map set)", parseBool)
26
- .option("--texture-prompt <text>", "text guidance for texturing (max 600 chars)")
30
+ .option("--enable-pbr <bool>", "generate normal/metallic/roughness maps, plus an emission map on meshy-6 below 8k (default: true, so game-engine imports carry the full map set)", parseBool)
31
+ .option("--texture-prompt <text>", "text guidance for texturing (max 800 chars)")
32
+ .option("--texture-image-urls <csv>", "1-4 views of the same object to guide texturing, front first; URLs or local files; independent of --image-urls. Exclusive with --texture-prompt", parseCsv)
27
33
  .addOption(new Option("--texture-resolution <res>", "base color texture size (default: 4k)").choices(["2k", "4k", "8k"]))
28
34
  .option("--remove-lighting <bool>", "strip baked lighting from the base color (default: true)", parseBool)
29
35
  .option("--target-formats <csv>", "glb,obj,fbx,stl,usdz,3mf (default: glb)", parseCsv);
@@ -39,15 +45,25 @@ const spec = {
39
45
  ["--enable-pbr", opts.enablePbr],
40
46
  ["--texture-resolution", opts.textureResolution],
41
47
  ["--texture-prompt", opts.texturePrompt],
48
+ ["--texture-image-urls", opts.textureImageUrls],
42
49
  ]) {
43
50
  if (value !== undefined) {
44
51
  throw new UsageError(`${flag} requires --should-texture true (the default output is an untextured draft mesh)`);
45
52
  }
46
53
  }
47
54
  }
55
+ const textureViews = opts.textureImageUrls;
56
+ if (textureViews && (textureViews.length < 1 || textureViews.length > 4)) {
57
+ throw new UsageError("--texture-image-urls takes 1-4 images of the same object");
58
+ }
59
+ if (textureViews && opts.texturePrompt !== undefined) {
60
+ throw new UsageError("--texture-image-urls and --texture-prompt are mutually exclusive");
61
+ }
48
62
  return {
49
63
  image_urls: urls,
64
+ texture_image_urls: textureViews,
50
65
  input_task_id: opts.inputTaskId,
66
+ geometry_resolution: opts.geometryResolution,
51
67
  should_texture: opts.shouldTexture,
52
68
  enable_pbr: opts.enablePbr,
53
69
  texture_prompt: opts.texturePrompt,
@@ -60,7 +76,8 @@ const spec = {
60
76
  // Draft-first, matching image-to-3d: white mesh by default, texturing
61
77
  // is its own step; texture knobs ride only when texturing is on (the
62
78
  // API rejects them otherwise), then game-ready values apply. No model
63
- // choice — the server default (latest = meshy-7) applies.
79
+ // choice and no geometry default: the server's standard pass applies,
80
+ // and Ultra (2k) rides only when asked for — it bills extra.
64
81
  const texturing = opts.shouldTexture === true;
65
82
  return {
66
83
  should_texture: false,
@@ -1 +1 @@
1
- {"version":3,"file":"multi-image-to-3d.js","sourceRoot":"","sources":["../../src/cmd/multi-image-to-3d.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"multi-image-to-3d.js","sourceRoot":"","sources":["../../src/cmd/multi-image-to-3d.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"remesh.d.ts","sourceRoot":"","sources":["../../src/cmd/remesh.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAyDH,eAAO,MAAM,aAAa,6BAA6B,CAAC"}
1
+ {"version":3,"file":"remesh.d.ts","sourceRoot":"","sources":["../../src/cmd/remesh.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA2DH,eAAO,MAAM,aAAa,6BAA6B,CAAC"}
@@ -5,7 +5,7 @@
5
5
  * standalone `convert` command; size changes are `resize`.
6
6
  */
7
7
  import { Option } from "commander";
8
- import { parseCsv, parseInt10 } from "../internal/flags.js";
8
+ import { parseBool, parseCsv, parseInt10 } from "../internal/flags.js";
9
9
  import { UsageError } from "../internal/errors.js";
10
10
  import { buildResourceCommand } from "../internal/task-command.js";
11
11
  const spec = {
@@ -18,12 +18,13 @@ const spec = {
18
18
  configure(cmd) {
19
19
  return cmd
20
20
  .option("--input-task-id <id>", "source Meshy task id (takes priority over --model-url)")
21
- .option("--model-url <src>", "3D model as http(s) URL or local file path (.glb/.gltf/.obj/.fbx/.stl)")
21
+ .option("--model-url <src>", "3D model: an http(s) URL (.glb/.gltf/.obj/.fbx/.stl) or a local .glb/.gltf file — the API takes inline uploads as glTF only, so host .stl/.obj/.fbx at a URL")
22
22
  .addOption(new Option("--topology <kind>", "quad (rigging/CAD/subdivision-friendly) | triangle (default; native engine topology)").choices(["quad", "triangle"]))
23
23
  .option("--target-polycount <n>", "100-300000 (default: 30000). Rigging tip: ~10000 rigs well", parseInt10)
24
24
  .addOption(new Option("--decimation-mode <level>", "adaptive 1|2|3|4; when set, overrides --target-polycount")
25
25
  .choices(["1", "2", "3", "4"]))
26
- .option("--target-formats <csv>", "glb,fbx,obj,usdz,blend,stl,3mf (default: glb)", parseCsv);
26
+ .option("--target-formats <csv>", "glb,fbx,obj,usdz,blend,stl,3mf (default: glb)", parseCsv)
27
+ .option("--alpha-thumbnail <bool>", "also render a transparent-background preview (alpha_thumbnail_url; default: false)", parseBool);
27
28
  },
28
29
  toPayload(opts) {
29
30
  if (!opts.inputTaskId && !opts.modelUrl && !opts.data) {
@@ -36,6 +37,7 @@ const spec = {
36
37
  target_polycount: opts.targetPolycount,
37
38
  decimation_mode: opts.decimationMode == null ? undefined : Number(opts.decimationMode),
38
39
  target_formats: opts.targetFormats,
40
+ alpha_thumbnail: opts.alphaThumbnail,
39
41
  };
40
42
  },
41
43
  toDefaults() {
@@ -1 +1 @@
1
- {"version":3,"file":"remesh.js","sourceRoot":"","sources":["../../src/cmd/remesh.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAE7F,MAAM,IAAI,GAAwB;IAChC,IAAI,EAAE,QAAQ;IACd,WAAW,EACT,sFAAsF;QACtF,qFAAqF;QACrF,+BAA+B;IACjC,MAAM,EAAE;QACN,WAAW,EAAE,sBAAsB;QACnC,SAAS,CAAC,GAAG;YACX,OAAO,GAAG;iBACP,MAAM,CAAC,sBAAsB,EAAE,wDAAwD,CAAC;iBACxF,MAAM,CAAC,mBAAmB,EAAE,wEAAwE,CAAC;iBACrG,SAAS,CACR,IAAI,MAAM,CACR,mBAAmB,EACnB,sFAAsF,CACvF,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAChC;iBACA,MAAM,CACL,wBAAwB,EACxB,4DAA4D,EAC5D,UAAU,CACX;iBACA,SAAS,CACR,IAAI,MAAM,CAAC,2BAA2B,EAAE,0DAA0D,CAAC;iBAChG,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACjC;iBACA,MAAM,CAAC,wBAAwB,EAAE,+CAA+C,EAAE,QAAQ,CAAC,CAAC;QACjG,CAAC;QACD,SAAS,CAAC,IAAI;YACZ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtD,MAAM,IAAI,UAAU,CAAC,wCAAwC,CAAC,CAAC;YACjE,CAAC;YACD,OAAO;gBACL,aAAa,EAAE,IAAI,CAAC,WAAW;gBAC/B,SAAS,EAAE,IAAI,CAAC,QAAQ;gBACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,gBAAgB,EAAE,IAAI,CAAC,eAAe;gBACtC,eAAe,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;gBACtF,cAAc,EAAE,IAAI,CAAC,aAAa;aACnC,CAAC;QACJ,CAAC;QACD,UAAU;YACR,mCAAmC;YACnC,OAAO,EAAE,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,CAAC;KACF;IACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;CAC5B,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC"}
1
+ {"version":3,"file":"remesh.js","sourceRoot":"","sources":["../../src/cmd/remesh.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,6BAA6B,CAAC;AAE7F,MAAM,IAAI,GAAwB;IAChC,IAAI,EAAE,QAAQ;IACd,WAAW,EACT,sFAAsF;QACtF,qFAAqF;QACrF,+BAA+B;IACjC,MAAM,EAAE;QACN,WAAW,EAAE,sBAAsB;QACnC,SAAS,CAAC,GAAG;YACX,OAAO,GAAG;iBACP,MAAM,CAAC,sBAAsB,EAAE,wDAAwD,CAAC;iBACxF,MAAM,CAAC,mBAAmB,EAAE,8JAA8J,CAAC;iBAC3L,SAAS,CACR,IAAI,MAAM,CACR,mBAAmB,EACnB,sFAAsF,CACvF,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAChC;iBACA,MAAM,CACL,wBAAwB,EACxB,4DAA4D,EAC5D,UAAU,CACX;iBACA,SAAS,CACR,IAAI,MAAM,CAAC,2BAA2B,EAAE,0DAA0D,CAAC;iBAChG,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CACjC;iBACA,MAAM,CAAC,wBAAwB,EAAE,+CAA+C,EAAE,QAAQ,CAAC;iBAC3F,MAAM,CAAC,0BAA0B,EAAE,oFAAoF,EAAE,SAAS,CAAC,CAAC;QACzI,CAAC;QACD,SAAS,CAAC,IAAI;YACZ,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACtD,MAAM,IAAI,UAAU,CAAC,wCAAwC,CAAC,CAAC;YACjE,CAAC;YACD,OAAO;gBACL,aAAa,EAAE,IAAI,CAAC,WAAW;gBAC/B,SAAS,EAAE,IAAI,CAAC,QAAQ;gBACxB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,gBAAgB,EAAE,IAAI,CAAC,eAAe;gBACtC,eAAe,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;gBACtF,cAAc,EAAE,IAAI,CAAC,aAAa;gBAClC,eAAe,EAAE,IAAI,CAAC,cAAc;aACrC,CAAC;QACJ,CAAC;QACD,UAAU;YACR,mCAAmC;YACnC,OAAO,EAAE,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,CAAC;KACF;IACD,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;CAC5B,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC"}
@@ -1,7 +1,8 @@
1
1
  /**
2
2
  * repair-printability — https://docs.meshy.ai/en/api/repair-printability
3
3
  * Fix non-watertight / non-manifold geometry. Existing textures are removed
4
- * (re-run retexture afterward if needed). Costs 10 credits on success.
4
+ * (re-run retexture afterward if needed). With a printer type or print size,
5
+ * walls too thin at that size are also thickened; the output keeps its scale.
5
6
  */
6
7
  export declare const repairPrintabilityCommand: import("commander").Command;
7
8
  //# sourceMappingURL=repair-printability.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"repair-printability.d.ts","sourceRoot":"","sources":["../../src/cmd/repair-printability.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA8BH,eAAO,MAAM,yBAAyB,6BAA6B,CAAC"}
1
+ {"version":3,"file":"repair-printability.d.ts","sourceRoot":"","sources":["../../src/cmd/repair-printability.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA4CH,eAAO,MAAM,yBAAyB,6BAA6B,CAAC"}