maoda-commander-tt 0.0.70 → 0.0.71

package/dist/{chunk-X52PJANF.js → chunk-YZFLZ22B.js}

@@ -3062,93 +3062,94 @@ async function readXyqGenerationPpeHeaders(settingsReader) {
   });
 }
 
-// src/modules/xyq/xyq-image-results.ts
+// src/modules/xyq/xyq-asset-results.ts
 import { ok as ok20 } from "rockbed/error";
-function collectXyqImageReferences(value) {
+function collectXyqAssetReferences(value, kind) {
   const references = /* @__PURE__ */ new Map();
-  collect(value, void 0, references, 0);
+  collect(value, kind, void 0, references, 0);
   return [...references.values()];
 }
-async function resolveXyqImageArtifacts(input) {
-  const references = input.artifacts.flatMap((artifact) => artifact.images);
+async function resolveXyqAssetArtifacts(input) {
+  const { kind } = input;
+  const label = kind === "image" ? "\u56FE\u7247" : "\u89C6\u9891";
+  const originalLabel = kind === "image" ? "\u65E0\u6C34\u5370\u539F\u56FE" : "\u65E0\u6C34\u5370\u89C6\u9891";
+  const references = input.artifacts.flatMap((artifact) => artifact.references);
   if (references.length === 0) {
-    return ok20(input.artifacts.map((artifact) => ({ ...artifact, images: [] })));
+    return ok20(input.artifacts.map((artifact) => ({ raw: artifact.raw, outputs: [] })));
   }
-  if (references.some((image) => !image.pippitAssetId)) {
-    return invalidResult("XYQ \u56FE\u7247\u751F\u6210\u7ED3\u679C\u7F3A\u5C11 pippit_asset_id\uFF0C\u65E0\u6CD5\u67E5\u8BE2\u65E0\u6C34\u5370\u539F\u56FE");
+  if (references.some((reference) => !reference.pippitAssetId)) {
+    return invalidResult(kind, `XYQ ${label}\u751F\u6210\u7ED3\u679C\u7F3A\u5C11 pippit_asset_id\uFF0C\u65E0\u6CD5\u67E5\u8BE2${originalLabel}`);
   }
-  const runExtra = parseRecord(input.run.extra);
-  const projectId = normalize(input.thread.project_id) ?? normalize(input.run.project_id) ?? normalize(parseRecord(runExtra?.client_extra)?.project_id) ?? /^p(\d+)_/.exec(input.threadId)?.[1];
-  if (!projectId) {
-    return invalidResult("XYQ \u56FE\u7247\u4EFB\u52A1\u7F3A\u5C11 project_id\uFF0C\u65E0\u6CD5\u67E5\u8BE2\u65E0\u6C34\u5370\u539F\u56FE");
-  }
-  const pippitAssetIds = [...new Set(references.map((image) => image.pippitAssetId))];
+  const pippitAssetIds = [...new Set(references.map((reference) => reference.pippitAssetId))];
   const response = await requestXyqJson(
     input.fetcher,
     `${XYQ_ORIGIN}/api/biz/v1/asset/query`,
     {
       method: "POST",
       headers: { ...input.headers, "content-type": "application/json" },
-      body: JSON.stringify({ Base: { Client: "web" }, project_id: projectId, pippit_asset_ids: pippitAssetIds })
+      body: JSON.stringify({ Base: { Client: "web" }, pippit_asset_ids: pippitAssetIds })
     },
     {
-      requestFailedCode: XyqErrorCode.ImageQueryRequestFailed,
-      responseInvalidCode: XyqErrorCode.ImageQueryResponseInvalid,
-      operation: "\u67E5\u8BE2 XYQ \u56FE\u7247\u65E0\u6C34\u5370\u539F\u56FE"
+      requestFailedCode: kind === "image" ? XyqErrorCode.ImageQueryRequestFailed : XyqErrorCode.VideoQueryRequestFailed,
+      responseInvalidCode: kind === "image" ? XyqErrorCode.ImageQueryResponseInvalid : XyqErrorCode.VideoQueryResponseInvalid,
+      operation: `\u67E5\u8BE2 XYQ ${originalLabel}`
     }
   );
   if (!response.ok) return response;
   const data = isRecord7(response.value.data) ? response.value.data : {};
   if (!Array.isArray(data.Assets)) {
-    return invalidResult("XYQ \u56FE\u7247\u8D44\u4EA7\u54CD\u5E94\u7F3A\u5C11 Assets\uFF0C\u65E0\u6CD5\u83B7\u53D6\u65E0\u6C34\u5370\u539F\u56FE");
+    return invalidResult(kind, `XYQ ${label}\u8D44\u4EA7\u54CD\u5E94\u7F3A\u5C11 Assets\uFF0C\u65E0\u6CD5\u83B7\u53D6${originalLabel}`);
   }
   const urls = /* @__PURE__ */ new Map();
   for (const asset of data.Assets) {
-    if (!isRecord7(asset) || asset.AssetType !== 1) continue;
+    if (!isRecord7(asset) || asset.AssetType !== (kind === "image" ? 1 : 2)) continue;
     const id = normalize(asset.PippitAssetID);
     if (!id || !pippitAssetIds.includes(id)) continue;
-    const image = isRecord7(asset.Image) ? asset.Image : {};
-    const preview = isRecord7(image.not_watermark_preview) ? image.not_watermark_preview : {};
-    const original = isRecord7(preview.previewinfo) ? preview.previewinfo : {};
-    const url = httpUrl(original.preview_url);
+    const media = asset[kind === "image" ? "Image" : "Video"];
+    const url = isRecord7(media) ? originalUrl(kind, media) : void 0;
     if (url) urls.set(id, url);
   }
   const missingId = pippitAssetIds.find((id) => !urls.has(id));
   if (missingId) {
-    return invalidResult(`XYQ \u56FE\u7247\u8D44\u4EA7 ${missingId} \u7F3A\u5C11\u65E0\u6C34\u5370\u539F\u56FE\u5730\u5740`);
+    return invalidResult(kind, `XYQ ${label}\u8D44\u4EA7 ${missingId} \u7F3A\u5C11${originalLabel}\u5730\u5740`);
   }
   return ok20(input.artifacts.map((artifact) => ({
-    ...artifact,
-    images: artifact.images.map((image) => ({ ...image, downloadUrl: urls.get(image.pippitAssetId) }))
+    raw: artifact.raw,
+    outputs: artifact.references.map((reference) => ({
+      ...reference,
+      downloadUrl: urls.get(reference.pippitAssetId)
+    }))
   })));
 }
-function collect(value, inheritedId, references, depth) {
+function collect(value, kind, inheritedId, references, depth) {
   if (depth > 10) return;
   if (typeof value === "string") {
     const parsed = parseValue(value);
-    if (parsed !== void 0) collect(parsed, inheritedId, references, depth + 1);
+    if (parsed !== void 0) collect(parsed, kind, inheritedId, references, depth + 1);
     return;
   }
   if (Array.isArray(value)) {
-    for (const child of value) collect(child, inheritedId, references, depth + 1);
+    for (const child of value) collect(child, kind, inheritedId, references, depth + 1);
     return;
   }
   if (!isRecord7(value)) return;
   const pippitAssetId = normalize(value.pippit_asset_id ?? value.pippitAssetId) ?? inheritedId;
   for (const [key, child] of Object.entries(value)) {
-    if (key === "image" || key === "images") collectExplicit(child, pippitAssetId, references, depth + 1);
-    collect(child, pippitAssetId, references, depth + 1);
+    if (key === kind || key === `${kind}s`) {
+      collectExplicit(child, kind, pippitAssetId, references, depth + 1);
+    }
+    collect(child, kind, pippitAssetId, references, depth + 1);
   }
 }
-function collectExplicit(value, inheritedId, references, depth) {
+function collectExplicit(value, kind, inheritedId, references, depth) {
   if (depth > 10) return;
   if (typeof value === "string") {
     const parsed = parseValue(value);
-    if (parsed !== void 0) collectExplicit(parsed, inheritedId, references, depth + 1);
+    if (parsed !== void 0) collectExplicit(parsed, kind, inheritedId, references, depth + 1);
     return;
   }
   if (Array.isArray(value)) {
-    for (const child of value) collectExplicit(child, inheritedId, references, depth + 1);
+    for (const child of value) collectExplicit(child, kind, inheritedId, references, depth + 1);
     return;
   }
   if (!isRecord7(value)) return;
@@ -3160,19 +3161,40 @@ function collectExplicit(value, inheritedId, references, depth) {
   if (!assetId && !pippitAssetId && !agentUrl && !sceneUrls) return;
   const width = number(metadata.width ?? value.width);
   const height = number(metadata.height ?? value.height);
-  const name = normalize(value.name);
+  const name = kind === "image" ? normalize(value.name) : void 0;
+  const extra = parseRecord(value.extra) ?? {};
+  const durationMs = kind === "video" ? number(metadata.duration_ms ?? value.duration_ms ?? extra.ark_video_duration_ms) : void 0;
   const reference = {
     ...assetId ? { assetId } : {},
     ...pippitAssetId ? { pippitAssetId } : {},
     ...width !== void 0 ? { width } : {},
     ...height !== void 0 ? { height } : {},
-    ...name ? { name } : {}
+    ...name ? { name } : {},
+    ...durationMs !== void 0 ? { durationMs } : {}
   };
-  const identity = assetId ? `asset:${assetId}` : pippitAssetId ? `pippit:${pippitAssetId}` : `image:${references.size}`;
-  references.set(identity, reference);
+  const identity = assetId ? `asset:${assetId}` : pippitAssetId ? `pippit:${pippitAssetId}` : `${kind}:${references.size}`;
+  const existing = references.get(identity);
+  if (kind === "image" || !existing || qualityScore(reference) > qualityScore(existing)) {
+    references.set(identity, reference);
+  }
+}
+function qualityScore(reference) {
+  return (reference.width ?? 0) * (reference.height ?? 0);
+}
+function originalUrl(kind, media) {
+  if (kind === "video") {
+    const noWatermark = isRecord7(media.no_watermark_video_url) ? media.no_watermark_video_url : {};
+    return httpUrl(normalize(media.origin_url) ?? noWatermark.download_url);
+  }
+  const preview = isRecord7(media.not_watermark_preview) ? media.not_watermark_preview : {};
+  const original = isRecord7(preview.previewinfo) ? preview.previewinfo : {};
+  return httpUrl(original.preview_url);
 }
-function invalidResult(message) {
-  return xyqError(XyqErrorCode.ImageQueryResponseInvalid, message);
+function invalidResult(kind, message) {
+  return xyqError(
+    kind === "image" ? XyqErrorCode.ImageQueryResponseInvalid : XyqErrorCode.VideoQueryResponseInvalid,
+    message
+  );
 }
 function httpUrl(value) {
   const normalized = typeof value === "string" ? value.trim() : "";
@@ -3335,18 +3357,19 @@ var XyqSession = class {
     const runRecord = isRecord7(run) ? run : {};
     const serverRunId = normalizeString2(runRecord.run_id);
     const entryList = Array.isArray(runRecord.entry_list) ? runRecord.entry_list : [];
-    const artifactReferences = entryList.map(extractImageArtifact).filter((artifact) => artifact !== void 0);
     const state = mapXyqRunState(toNumber(runRecord.state));
-    const artifactsResult = state === "completed" ? await resolveXyqImageArtifacts({
+    const artifactReferences = entryList.map((entry) => extractAssetArtifact(entry, "image", state === "completed")).filter((artifact) => artifact !== void 0);
+    const artifactsResult = await resolveXyqAssetArtifacts({
       fetcher: this._fetcher,
       headers: { ...this._headers(), ...ppeHeadersResult.value },
-      threadId,
-      thread,
-      run: runRecord,
+      kind: "image",
       artifacts: artifactReferences
-    }) : ok21(artifactReferences.map((artifact) => ({ ...artifact, images: [] })));
+    });
     if (!artifactsResult.ok) return artifactsResult;
-    const artifacts = artifactsResult.value;
+    const artifacts = artifactsResult.value.map((artifact) => ({
+      images: artifact.outputs,
+      raw: artifact.raw
+    }));
     return ok21({
       taskId: `${XYQ_IMAGE_TASK_ID_PREFIX}${threadId}`,
       threadId,
@@ -3699,9 +3722,19 @@ var XyqSession = class {
     const runRecord = isRecord7(run) ? run : {};
     const serverRunId = normalizeString2(runRecord.run_id);
     const entryList = Array.isArray(runRecord.entry_list) ? runRecord.entry_list : [];
-    const artifacts = entryList.map(extractVideoArtifact).filter((artifact) => artifact !== void 0);
-    const providerState = mapXyqRunState(toNumber(runRecord.state));
-    const state = hasUsableVideoOutput(artifacts) ? "completed" : providerState;
+    const state = mapXyqRunState(toNumber(runRecord.state));
+    const artifactReferences = entryList.map((entry) => extractAssetArtifact(entry, "video", state === "completed")).filter((artifact) => artifact !== void 0);
+    const artifactsResult = await resolveXyqAssetArtifacts({
+      fetcher: this._fetcher,
+      headers: { ...this._headers(), ...ppeHeadersResult.value },
+      kind: "video",
+      artifacts: artifactReferences
+    });
+    if (!artifactsResult.ok) return artifactsResult;
+    const artifacts = artifactsResult.value.map((artifact) => ({
+      videos: artifact.outputs,
+      raw: artifact.raw
+    }));
     const retryAfterSeconds = isTerminalXyqTaskState(state) ? 0 : VIDEO_POLL_INTERVAL_SECONDS;
     return ok21({
       taskId: threadId,
@@ -4236,9 +4269,6 @@ function mapXyqRunState(stateCode) {
 function isTerminalXyqTaskState(state) {
   return ["completed", "failed", "canceled", "inputRequired"].includes(state);
 }
-function hasUsableVideoOutput(artifacts) {
-  return artifacts.some((artifact) => artifact.videos.length > 0);
-}
 function hasUsableAudioOutput(artifacts) {
   return artifacts.some((artifact) => artifact.audios.length > 0);
 }
@@ -4255,25 +4285,15 @@ function extractAudioArtifact(entry) {
     raw: camelizeValue(artifact)
   };
 }
-function extractVideoArtifact(entry) {
-  if (!isRecord7(entry)) {
-    return void 0;
-  }
+function extractAssetArtifact(entry, kind, completed) {
+  if (!isRecord7(entry)) return void 0;
   const artifact = parseJsonRecord(entry.artifact);
-  if (!artifact) {
-    return void 0;
-  }
+  if (!artifact) return void 0;
   return {
-    videos: deepCollectVideoOutputs(artifact),
+    references: completed ? collectXyqAssetReferences(artifact, kind) : [],
     raw: camelizeValue(artifact)
   };
 }
-function extractImageArtifact(entry) {
-  if (!isRecord7(entry)) return void 0;
-  const artifact = parseJsonRecord(entry.artifact);
-  if (!artifact) return void 0;
-  return { images: collectXyqImageReferences(artifact), raw: camelizeValue(artifact) };
-}
 function deepCollectAudioOutputs(value) {
   const results = /* @__PURE__ */ new Map();
   collectAudioOutputs(value, void 0, results, 0);
@@ -4370,89 +4390,6 @@ function collectExplicitAudio(value, inheritedPippitAssetId, results, depth) {
   const identity = assetId ? `asset:${assetId}` : pippitAssetId ? `pippit:${pippitAssetId}` : `url:${downloadUrl}`;
   results.set(identity, output);
 }
-function deepCollectVideoOutputs(value) {
-  const results = /* @__PURE__ */ new Map();
-  collectVideoOutputs(value, void 0, results, 0);
-  return [...results.values()];
-}
-function collectVideoOutputs(value, inheritedPippitAssetId, results, depth) {
-  if (depth > 10) {
-    return;
-  }
-  if (typeof value === "string") {
-    const parsed = parseJsonValue(value);
-    if (parsed !== void 0) {
-      collectVideoOutputs(parsed, inheritedPippitAssetId, results, depth + 1);
-    }
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      collectVideoOutputs(item, inheritedPippitAssetId, results, depth + 1);
-    }
-    return;
-  }
-  if (!isRecord7(value)) {
-    return;
-  }
-  const pippitAssetId = normalizeString2(value.pippit_asset_id) ?? inheritedPippitAssetId;
-  for (const [key, child] of Object.entries(value)) {
-    if (key === "video" || key === "videos") {
-      collectExplicitVideo(child, pippitAssetId, results, depth + 1);
-    }
-    collectVideoOutputs(child, pippitAssetId, results, depth + 1);
-  }
-}
-function collectExplicitVideo(value, inheritedPippitAssetId, results, depth) {
-  if (depth > 10) {
-    return;
-  }
-  if (typeof value === "string") {
-    const parsed = parseJsonValue(value);
-    if (parsed !== void 0) {
-      collectExplicitVideo(parsed, inheritedPippitAssetId, results, depth + 1);
-    }
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      collectExplicitVideo(item, inheritedPippitAssetId, results, depth + 1);
-    }
-    return;
-  }
-  if (!isRecord7(value)) {
-    return;
-  }
-  const downloadUrl = normalizeString2(value.download_url) ?? normalizeString2(value.url);
-  if (!downloadUrl) {
-    return;
-  }
-  const metadata = isRecord7(value.metadata) ? value.metadata : {};
-  const extra = isRecord7(value.extra) ? value.extra : {};
-  const assetId = normalizeString2(value.asset_id);
-  const pippitAssetId = normalizeString2(value.pippit_asset_id) ?? inheritedPippitAssetId;
-  const width = toNumber(metadata.width ?? value.width);
-  const height = toNumber(metadata.height ?? value.height);
-  const durationMs = toNumber(
-    metadata.duration_ms ?? value.duration_ms ?? extra.ark_video_duration_ms
-  );
-  const output = {
-    downloadUrl,
-    ...assetId ? { assetId } : {},
-    ...pippitAssetId ? { pippitAssetId } : {},
-    ...width !== void 0 ? { width } : {},
-    ...height !== void 0 ? { height } : {},
-    ...durationMs !== void 0 ? { durationMs } : {}
-  };
-  const identity = assetId ? `asset:${assetId}` : pippitAssetId ? `pippit:${pippitAssetId}` : `url:${downloadUrl}`;
-  const existing = results.get(identity);
-  if (!existing || videoQualityScore(output) > videoQualityScore(existing)) {
-    results.set(identity, output);
-  }
-}
-function videoQualityScore(output) {
-  return (output.width ?? 0) * (output.height ?? 0);
-}
 function parseJsonRecord(value) {
   if (isRecord7(value)) {
     return value;
@@ -4746,14 +4683,14 @@ function collectTaskVideoOutputs(result) {
     for (const video of artifact.videos) {
       const identity = video.assetId ? `asset:${video.assetId}` : video.pippitAssetId ? `pippit:${video.pippitAssetId}` : `url:${video.downloadUrl}`;
       const existing = outputs.get(identity);
-      if (!existing || qualityScore(video) > qualityScore(existing)) {
+      if (!existing || qualityScore2(video) > qualityScore2(existing)) {
         outputs.set(identity, video);
       }
     }
   }
   return [...outputs.values()];
 }
-function qualityScore(output) {
+function qualityScore2(output) {
   return (output.width ?? 0) * (output.height ?? 0);
 }
 
@@ -9185,4 +9122,4 @@ export {
   TraexCommand,
   createRootCommands
 };
-//# sourceMappingURL=chunk-X52PJANF.js.map
+//# sourceMappingURL=chunk-YZFLZ22B.js.map