maoda-commander-tt 0.0.52 → 0.0.54

package/README.md

@@ -319,9 +319,9 @@ tt sc w2
 `wait` 等待已有任务，`--output` 隐含 `--wait`。生成是否成功以 `data.state` 为准，
 不能只看查询命令的 `code=0`；超时返回 `data.timedOut=true`，不会取消生成。
 
-`ai image` 根据 cross-app settings 的 `imagegen.source` 选择实现：值精确为 `xyq`
-（忽略大小写和首尾空格）时，通过 XYQ HTTP 提交；未配置、其他值或读取失败时继续
-使用原来的本地 Codex 后台任务。两种实现都返回 `taskId`、当前 `state` 和
+`ai image` 根据 cross-app settings 的 `imagegen.source` 选择实现：未配置、为空或值为
+`xyq`（忽略大小写和首尾空格）时，通过 XYQ HTTP 提交；显式配置其他值时使用
+原来的本地 Codex 后台任务。两种实现都返回 `taskId`、当前 `state` 和
 `nextCommand`。图片 ID 分别为 `xyq-image:<threadId>` 和 `local-image:<uuid>`；
 后续 `status` / `wait` 根据 ID 前缀回到原 provider，不受配置后来切换影响。
 
@@ -346,9 +346,10 @@ tt ai image list
 ```
 
 等待默认 360 秒，上限 600 秒。本地实现完成时会返回 `outputs[].localPath`；
-XYQ 的 `status` / `--wait` 会在 `outputs[]` 返回
-`remoteUrl`、`assetId`、`pippitAssetId` 和尺寸等槽位元数据。再次
-使用 `--output` 才会把 XYQ 产物下载到本地并补充 `localPath`；再次
+XYQ 优先使用 artifact 的 `image.url` 无水印原图，缺失时才回退到 `scene_urls`。
+`status` / `--wait` 会在 `outputs[]` 返回
+`downloadUrl`、`assetId`、`pippitAssetId` 和尺寸等槽位元数据。
+使用 `--output` 会把 XYQ 产物下载到本地，并用 `localPath` 取代 `downloadUrl`；再次
 `wait --output` 只下载或复制已有产物。
 
 参考图的跨 provider 稳定契约是可重复的 `--images <path>`：本地实现把有序绝对路径

package/dist/{chunk-ED7FLAXM.js → chunk-G43DMZTY.js}

@@ -1353,6 +1353,7 @@ function sleep(delayMs) {
 var XYQ_ORIGIN = "https://xyq.jianying.com";
 var XYQ_SESSION_COOKIE_NAME = "sessionid_pippitcn_web";
 var SEEDANCE_PPE_CONFIG_KEY = "seedance.ppe";
+var SEEDANCE_DEFAULT_PPE = "ppe_wyfree";
 var XYQ_TASK_ID_PREFIX = "xyq:";
 var XYQ_IMAGE_TASK_ID_PREFIX = "xyq-image:";
 var XYQ_VIDEO_MODEL_ID_MAP = {
@@ -2052,7 +2053,10 @@ var XyqSession = class {
   }
   async _readSubmitPpeHeaders() {
     if (!this._settingsReader) {
-      return ok7({});
+      return ok7({
+        "x-tt-env": SEEDANCE_DEFAULT_PPE,
+        "x-use-ppe": "1"
+      });
     }
     const settingResult = await this._settingsReader.getString(
       SEEDANCE_PPE_CONFIG_KEY
@@ -2063,12 +2067,11 @@ var XyqSession = class {
         `\u8BFB\u53D6 Seedance PPE \u8BBE\u7F6E\u5931\u8D25: ${settingResult.msg}`
       );
     }
-    const ppe = normalizeString2(settingResult.value);
-    const headers = ppe ? {
+    const ppe = normalizeString2(settingResult.value) ?? SEEDANCE_DEFAULT_PPE;
+    return ok7({
       "x-tt-env": ppe,
       "x-use-ppe": "1"
-    } : {};
-    return ok7(headers);
+    });
   }
 };
 function normalizeImageInput(input) {
@@ -2480,7 +2483,7 @@ function collectExplicitImage(value, inheritedPippitAssetId, results, depth) {
   }
   if (!isRecord2(value)) return;
   const sceneUrls = isRecord2(value.scene_urls) ? value.scene_urls : isRecord2(value.sceneUrls) ? value.sceneUrls : {};
-  const downloadUrl = normalizeString2(sceneUrls.download) ?? normalizeString2(sceneUrls.share_without_watermark ?? sceneUrls.shareWithoutWatermark) ?? normalizeString2(value.download_url ?? value.downloadUrl) ?? normalizeString2(value.url);
+  const downloadUrl = normalizeString2(value.url) ?? normalizeString2(sceneUrls.origin_url ?? sceneUrls.originUrl) ?? normalizeString2(sceneUrls.share_without_watermark ?? sceneUrls.shareWithoutWatermark) ?? normalizeString2(sceneUrls.download) ?? normalizeString2(value.download_url ?? value.downloadUrl) ?? normalizeString2(sceneUrls.preview_high ?? sceneUrls.previewHigh);
   if (!downloadUrl) return;
   const metadata = parseJsonRecord(value.metadata) ?? {};
   const assetId = normalizeString2(value.asset_id ?? value.assetId);
@@ -3779,15 +3782,14 @@ function collectXyqImageOutputs(result) {
   return [...outputs.values()];
 }
 function toTaskOutput(output, localPath) {
-  return {
-    ...localPath ? { localPath } : {},
-    remoteUrl: output.downloadUrl,
+  const metadata = {
     ...output.assetId ? { assetId: output.assetId } : {},
     ...output.pippitAssetId ? { pippitAssetId: output.pippitAssetId } : {},
     ...output.width !== void 0 ? { width: output.width } : {},
     ...output.height !== void 0 ? { height: output.height } : {},
     ...output.name ? { name: output.name } : {}
   };
+  return localPath ? { ...metadata, localPath } : { ...metadata, downloadUrl: output.downloadUrl };
 }
 function resolveImageOutputPaths(outputPath, count) {
   const resolved = path8.resolve(outputPath);
@@ -3828,7 +3830,8 @@ var RoutedImageTaskService = class {
   }
   async submit(input) {
     const source = await this._settingsReader.getString(IMAGE_GENERATION_SOURCE_SETTING_KEY);
-    const useXyq = source.ok && source.value?.trim().toLowerCase() === "xyq";
+    const configuredSource = source.ok ? source.value?.trim().toLowerCase() : void 0;
+    const useXyq = configuredSource === void 0 || configuredSource === "" || configuredSource === "xyq";
     const result = await (useXyq ? this._xyqService : this._localService).submit(input);
     return result.ok ? result : withFailureSource(result, useXyq ? "xyq" : "local");
   }
@@ -3936,7 +3939,7 @@ var AiImageStatusCommand = class extends BaseCommand {
     return [
       "data \u5FC5\u9009\u5B57\u6BB5: taskId:string\u3001state:string\u3001outputs:Array\uFF1B\u53EF\u9009\u5B57\u6BB5\uFF08?\uFF09: source?:local|xyq\u3001createdAt?:string\u3001updatedAt?:string\u3001retryAfterSeconds?:number\u3001failReason?:string\u3001nextCommand?:string\u3002",
       "taskId \u683C\u5F0F\u4E3A local-image:<uuid> \u6216 xyq-image:<threadId>\uFF1B\u524D\u7F00\u51B3\u5B9A\u67E5\u8BE2\u539F provider\uFF0C\u4E0D\u8BFB\u53D6\u5F53\u524D imagegen.source\u3002state \u679A\u4E3E: submitted/working/completed/failed/unknown\u3002code=0 \u8868\u793A\u67E5\u8BE2\u6210\u529F\uFF0C\u4E0D\u8868\u793A\u56FE\u7247\u751F\u6210\u6210\u529F\u3002",
-      "outputs \u65E0\u53EF\u7528\u56FE\u7247\u65F6\u4E3A []\uFF1B\u672C\u5730\u4EA7\u7269\u542B localPath\uFF0CXYQ \u4EA7\u7269\u53EF\u542B remoteUrl\u3001assetId\u3001pippitAssetId\u3001width\u3001height\u3001name\u3002",
+      "outputs \u65E0\u53EF\u7528\u56FE\u7247\u65F6\u4E3A []\uFF1B\u672C\u5730\u4EA7\u7269\u542B localPath\uFF0CXYQ \u4F18\u5148\u8FD4\u56DE\u65E0\u6C34\u5370\u539F\u56FE\u7684 downloadUrl\uFF1B\u4E24\u8005\u4E0E ai audio/video \u7684\u8F93\u51FA\u5951\u7EA6\u4E00\u81F4\u3002\u56FE\u7247\u4EA7\u7269\u8FD8\u53EF\u542B assetId\u3001pippitAssetId\u3001width\u3001height\u3001name\u3002",
       "submitted/working \u53EF\u8FD4\u56DE retryAfterSeconds\uFF08\u5EFA\u8BAE\u67E5\u8BE2\u95F4\u9694\uFF0C\u5355\u4F4D\u79D2\uFF09\uFF1Bfailed/unknown \u53EF\u8FD4\u56DE failReason\u3002\u672C\u547D\u4EE4\u5355\u6B21\u67E5\u8BE2\uFF0C\u4E0D\u8FD4\u56DE timedOut\u3002",
       "nextCommand \u5728 submitted/working \u65F6\u4E3A wait \u547D\u4EE4\uFF0Cunknown \u65F6\u4E3A status \u547D\u4EE4\uFF0Ccompleted/failed \u65F6\u7701\u7565\u3002",
       'data \u793A\u4F8B\uFF08\u7701\u7565\u53EF\u9009\u5B57\u6BB5\uFF09: {"taskId":"local-image:00000000-0000-4000-8000-000000000001","state":"completed","outputs":[{"localPath":"/tmp/image-tasks/00000000-0000-4000-8000-000000000001/image.png"}]}',
@@ -3971,7 +3974,7 @@ var AiImageWaitCommand = class extends BaseCommand {
     return [
       "data \u5FC5\u9009\u5B57\u6BB5: taskId:string\u3001state:string\u3001outputs:Array<{localPath:string}>\uFF1B\u53EF\u9009\u5B57\u6BB5\uFF08?\uFF09: createdAt?:string\u3001updatedAt?:string\u3001retryAfterSeconds?:number\u3001timedOut?:true\u3001failReason?:string\u3001nextCommand?:string\u3002",
       "taskId \u683C\u5F0F\u4E3A local-image:<uuid> \u6216 xyq-image:<threadId>\uFF1B\u524D\u7F00\u51B3\u5B9A\u7B49\u5F85\u539F provider\u3002state \u679A\u4E3E: submitted/working/completed/failed/unknown\u3002code=0 \u53EA\u8868\u793A\u8FD4\u56DE\u4E86\u7B49\u5F85\u7ED3\u679C\uFF0C\u751F\u6210\u662F\u5426\u6210\u529F\u987B\u68C0\u67E5 state\u3002",
-      "outputs \u65E0\u53EF\u7528\u56FE\u7247\u65F6\u4E3A []\uFF1B\u672C\u5730\u5B8C\u6210\u65F6\u542B localPath\uFF1BXYQ \u5B8C\u6210\u65F6\u542B remoteUrl \u548C\u7D20\u6750\u5143\u6570\u636E\uFF0C\u53EA\u6709\u4F7F\u7528 --output \u624D\u4E0B\u8F7D\u5E76\u8865\u5145 localPath\u3002\u91CD\u590D\u8C03\u7528\u4E0D\u4F1A\u91CD\u65B0\u751F\u6210\u3002",
+      "outputs \u65E0\u53EF\u7528\u56FE\u7247\u65F6\u4E3A []\uFF1B\u672A\u4E0B\u8F7D\u7684 XYQ \u4EA7\u7269\u542B downloadUrl\uFF0C\u4F7F\u7528 --output \u540E\u6539\u4E3A\u7EDD\u5BF9 localPath\uFF1B\u4E24\u8005\u4E92\u65A5\uFF0C\u4E0E ai audio/video \u4E00\u81F4\u3002\u91CD\u590D\u8C03\u7528\u4E0D\u4F1A\u91CD\u65B0\u751F\u6210\u3002",
       "createdAt/updatedAt \u662F\u8BB0\u5F55\u521B\u5EFA/\u6700\u540E\u5199\u5165\u65F6\u95F4\uFF08ISO 8601 UTC\uFF09\uFF0C\u4E0D\u662F\u7B49\u5F85\u7ED3\u675F\u65F6\u95F4\uFF1Bsubmitted/working \u53EF\u8FD4\u56DE retryAfterSeconds\uFF08\u5355\u4F4D\u79D2\uFF09\uFF0Cfailed/unknown \u53EF\u8FD4\u56DE failReason\u3002",
       "\u4EC5\u7B49\u5F85\u8D85\u65F6\u65F6\u8FD4\u56DE timedOut=true\uFF0C\u6B64\u65F6 state \u4ECD\u4E3A submitted/working\uFF0C\u540E\u53F0\u4EFB\u52A1\u7EE7\u7EED\uFF1B\u5176\u4ED6\u7ED3\u679C\u7701\u7565 timedOut\u3002",
       "nextCommand \u5728 submitted/working \u65F6\u4E3A wait \u547D\u4EE4\uFF08\u4FDD\u7559\u672C\u6B21 --output\uFF09\uFF0Cunknown \u65F6\u4E3A status \u547D\u4EE4\uFF0Ccompleted/failed \u65F6\u7701\u7565\u3002",
@@ -4014,7 +4017,7 @@ var AiImageCommand = class extends BaseCommandGroup {
   _meta() {
     return {
       name: "image",
-      description: "\u63D0\u4EA4\u56FE\u7247\u751F\u6210\u4EFB\u52A1\uFF1Bimagegen.source=xyq \u65F6\u8D70 XYQ\uFF0C\u5426\u5219\u8D70\u672C\u5730\u5B9E\u73B0",
+      description: "\u63D0\u4EA4\u56FE\u7247\u751F\u6210\u4EFB\u52A1\uFF1B\u9ED8\u8BA4\u8D70 XYQ\uFF0C\u53EF\u7528 imagegen.source \u5207\u6362\u5B9E\u73B0",
       output: "json"
     };
   }
@@ -4046,12 +4049,12 @@ var AiImageCommand = class extends BaseCommandGroup {
   _agentContract() {
     return [
       "data \u5FC5\u9009\u5B57\u6BB5: taskId:string\u3001state:string\u3001outputs:Array\uFF1B\u53EF\u9009\u5B57\u6BB5\uFF08?\uFF09: source?:local|xyq\u3001createdAt?:string\u3001updatedAt?:string\u3001retryAfterSeconds?:number\u3001timedOut?:true\u3001failReason?:string\u3001nextCommand?:string\u3002",
-      "imagegen.source \u7CBE\u786E\u4E3A xyq\uFF08\u5FFD\u7565\u5927\u5C0F\u5199\u4E0E\u9996\u5C3E\u7A7A\u683C\uFF09\u65F6\u8D70 XYQ HTTP\uFF1B\u672A\u914D\u7F6E\u3001\u5176\u4ED6\u503C\u6216\u8BBE\u7F6E\u8BFB\u53D6\u5931\u8D25\u65F6\u4FDD\u6301\u672C\u5730\u5B9E\u73B0\u3002taskId \u4E3A local-image:<uuid> \u6216 xyq-image:<threadId>\u3002",
+      "imagegen.source \u672A\u914D\u7F6E\u3001\u4E3A\u7A7A\u6216\u4E3A xyq\uFF08\u5FFD\u7565\u5927\u5C0F\u5199\u4E0E\u9996\u5C3E\u7A7A\u683C\uFF09\u65F6\u8D70 XYQ HTTP\uFF1B\u663E\u5F0F\u914D\u7F6E\u5176\u4ED6\u503C\u65F6\u8D70\u672C\u5730\u5B9E\u73B0\u3002taskId \u4E3A local-image:<uuid> \u6216 xyq-image:<threadId>\u3002",
       "\u53C2\u8003\u56FE\u7EDF\u4E00\u901A\u8FC7\u53EF\u91CD\u590D --images \u4F20\u5165\uFF0C\u63D0\u793A\u8BCD\u4EE5\u56FE1\u3001\u56FE2\u6307\u4EE3\uFF1BXYQ \u4F1A\u5148\u4E0A\u4F20\u518D\u5199\u5165 pippit_asset_ids\uFF0C\u672C\u5730\u5B9E\u73B0\u4F1A\u628A\u6709\u5E8F\u7EDD\u5BF9\u8DEF\u5F84\u52A0\u5165\u751F\u6210\u4E0A\u4E0B\u6587\u3002",
       "\u4E24\u79CD\u5B9E\u73B0\u90FD\u63D0\u4F9B 2K \u56FE\u7247\uFF0C\u65E0\u9700\u5728 prompt \u4E2D\u58F0\u660E\u5206\u8FA8\u7387\u3002--effort \u4EC5\u7528\u4E8E XYQ\uFF0C\u9ED8\u8BA4 medium\uFF0C\u901A\u5E38\u65E0\u9700\u8BBE\u7F6E\u3002",
       `--aspect-ratio \u652F\u6301 ${IMAGE_ASPECT_RATIOS.join("\u3001")}\uFF1BXYQ \u672A\u8BBE\u7F6E\u65F6\u9ED8\u8BA4 16:9\uFF0C\u975E XYQ \u672A\u8BBE\u7F6E\u65F6\u4E0D\u8FFD\u52A0\u6BD4\u4F8B\u3002\u4FEE\u56FE\u65F6\u4F7F\u7528 auto\uFF0C\u65E0\u9700\u5728 prompt \u91CD\u590D\u6BD4\u4F8B\uFF1B\u9700\u8981\u679A\u4E3E\u5916\u7684\u7279\u6B8A\u6BD4\u4F8B\u65F6\u4F7F\u7528 auto\uFF0C\u5E76\u5728 prompt \u4E2D\u63CF\u8FF0\u76EE\u6807\u6BD4\u4F8B\u3002\u975E XYQ \u5B9E\u73B0\u4F1A\u628A\u663E\u5F0F\u8BBE\u7F6E\u7684\u5177\u4F53\u6BD4\u4F8B\u52A0\u5165\u672C\u5730\u751F\u6210\u4E0A\u4E0B\u6587\uFF0Cauto \u4E0D\u8FFD\u52A0\u3002`,
       "state \u679A\u4E3E: submitted/working/completed/failed/unknown\u3002code=0 \u53EA\u8868\u793A\u547D\u4EE4\u6210\u529F\u8FD4\u56DE\u7ED3\u679C\uFF0C\u751F\u6210\u662F\u5426\u6210\u529F\u987B\u68C0\u67E5 state\u3002",
-      "outputs \u65E0\u53EF\u7528\u56FE\u7247\u65F6\u4E3A []\uFF1B\u672C\u5730\u5B8C\u6210\u65F6 localPath \u662F\u56FE\u7247\u7EDD\u5BF9\u8DEF\u5F84\uFF1BXYQ \u67E5\u8BE2\u53EF\u8FD4\u56DE remoteUrl\u3001assetId\u3001pippitAssetId\u3001width\u3001height\u3001name\uFF0C\u53EA\u6709 --output \u4F1A\u4E0B\u8F7D\u8FDC\u7AEF\u4EA7\u7269\u5E76\u8865\u5145 localPath\u3002",
+      "outputs \u65E0\u53EF\u7528\u56FE\u7247\u65F6\u4E3A []\uFF1BXYQ \u4F18\u5148\u8FD4\u56DE\u65E0\u6C34\u5370\u539F\u56FE\u3002\u672A\u4E0B\u8F7D\u7684 XYQ \u4EA7\u7269\u542B downloadUrl\uFF0C\u4F7F\u7528 --output \u540E\u6539\u4E3A\u7EDD\u5BF9 localPath\uFF1B\u4E24\u8005\u4E92\u65A5\uFF0C\u4E0E ai audio/video \u4E00\u81F4\u3002\u56FE\u7247\u4EA7\u7269\u8FD8\u53EF\u542B assetId\u3001pippitAssetId\u3001width\u3001height\u3001name\u3002",
       "createdAt/updatedAt \u662F\u4EFB\u52A1\u8BB0\u5F55\u521B\u5EFA/\u6700\u540E\u5199\u5165\u65F6\u95F4\uFF08ISO 8601 UTC\uFF09\uFF0C\u4E0D\u662F\u672C\u6B21\u67E5\u8BE2\u65F6\u95F4\uFF1Bsubmitted/working \u53EF\u8FD4\u56DE retryAfterSeconds\uFF0C\u5355\u4F4D\u79D2\uFF1Bfailed/unknown \u53EF\u8FD4\u56DE failReason\u3002",
       "nextCommand \u5728 submitted/working \u65F6\u4E3A wait \u547D\u4EE4\uFF08\u4FDD\u7559\u672C\u6B21 --output\uFF09\uFF0Cunknown \u65F6\u4E3A status \u547D\u4EE4\uFF0Ccompleted/failed \u65F6\u7701\u7565\u3002",
       "\u9ED8\u8BA4\u5728\u5F53\u524D provider \u63A5\u53D7\u4EFB\u52A1\u540E\u8FD4\u56DE\uFF1B--wait \u6216 --output \u7B49\u5F85\u540C\u4E00\u4EFB\u52A1\uFF0C\u4EC5\u7B49\u5F85\u8D85\u65F6\u65F6\u8FD4\u56DE timedOut=true\uFF0C\u4EFB\u52A1\u7EE7\u7EED\u8FD0\u884C\u3002",
@@ -5158,6 +5161,7 @@ var AiVideoCommand = class extends BaseCommandGroup {
     return [
       "\u9ED8\u8BA4: \u751F\u6210\u8FC7\u7A0B\u5F02\u6B65\uFF0C\u4F46\u672C\u547D\u4EE4\u4F1A\u540C\u6B65\u5B8C\u6210\u4F1A\u8BDD\u521D\u59CB\u5316\u3001\u53C2\u8003\u7D20\u6750\u4E0A\u4F20\u548C\u8FDC\u7AEF\u4EFB\u52A1\u521B\u5EFA\uFF0C\u4E4B\u540E\u624D\u8FD4\u56DE taskId\u3002",
       "\u89C6\u9891 taskId \u76F4\u63A5\u4F7F\u7528\u540E\u7AEF threadId\u3002",
+      "XYQ \u63D0\u4EA4\u8BFB\u53D6 seedance.ppe\uFF1B\u672A\u914D\u7F6E\u6216\u4E3A\u7A7A\u65F6\u9ED8\u8BA4\u4F7F\u7528 ppe_wyfree\u3002",
       '\u63D0\u4EA4 data \u5B57\u6BB5\uFF08? \u8868\u793A\u53EF\u9009\uFF09\uFF1A{taskId:string,state:"submitted",nextCommand:string,estimatedWaitSeconds?:number,appliedParameters?:object,adjustments?:object[]}\uFF1B\u6B64\u65F6\u6CA1\u6709 outputs \u5B57\u6BB5\u3002',
       '\u63D0\u4EA4 data \u793A\u4F8B\uFF08\u7701\u7565\u53EF\u9009\u5B57\u6BB5\uFF09\uFF1A{"taskId":"thread-id","state":"submitted","nextCommand":"tt ai video wait --task-id thread-id"}',
       "estimatedWaitSeconds \u662F\u9884\u8BA1\u751F\u6210\u79D2\u6570\uFF1BappliedParameters \u662F\u5B9E\u9645\u751F\u6548\u53C2\u6570\uFF1Badjustments \u662F\u53C2\u6570\u9ED8\u8BA4\u503C\u6216\u8C03\u6574\u8BF4\u660E\uFF0C\u4EC5\u975E\u7A7A\u65F6\u8FD4\u56DE\u3002",
@@ -8633,4 +8637,4 @@ export {
   ToolCommand,
   createRootCommands
 };
-//# sourceMappingURL=chunk-ED7FLAXM.js.map
+//# sourceMappingURL=chunk-G43DMZTY.js.map