maoda-commander-tt 0.0.45 → 0.0.47

package/README.md

@@ -58,6 +58,92 @@ pnpm build
 pnpm start -- --help
 ```
 
+## 发布到 npm
+
+发布采用 GitHub Actions + npm Trusted Publishing（OIDC）。本地 `pnpm pub` 负责
+检查、递增 patch 版本、提交版本和推送 `tt-v<版本>` 标签；GitHub Actions 在
+`template-commander/` 中重新安装依赖、测试、构建，再发布 `maoda-commander-tt`。
+
+### 首次配置
+
+1. 将本次改造提交到 `main` 并推送到 `imaoda/local-multi-repo`，确保仓库根目录的
+   `.github/workflows/publish-tt.yml` 已在 GitHub 上，且仓库已启用 Actions。
+2. 登录 [npm 包设置](https://www.npmjs.com/package/maoda-commander-tt/access)，
+   在 Trusted publishing 中添加 GitHub Actions，填写：
+
+   | 字段 | 值 |
+   |---|---|
+   | Organization or user | `imaoda` |
+   | Repository | `local-multi-repo` |
+   | Workflow filename | `publish-tt.yml` |
+   | Environment name | 留空 |
+   | Allowed actions | 允许直接执行 `npm publish` |
+
+   Workflow filename 只填文件名。只允许 `npm stage publish` 时，发布仍需人工批准。
+   保存信任配置时需完成一次 npm 账号验证，后续工作流发布使用 OIDC，无需配置
+   `NPM_TOKEN` 或逐次登录 npm。
+3. 按下面的日常流程发布，在 GitHub Actions 中确认第一次发布成功。
+
+网页保存异常时，也可以使用官方 CLI 配置同一个信任关系（终端登录及配置时
+按 npm 提示完成账号验证）：
+
+```bash
+npm exec --yes --package=npm@11.16.0 -- npm login --registry=https://registry.npmjs.org
+npm exec --yes --package=npm@11.16.0 -- npm trust github maoda-commander-tt \
+  --repo imaoda/local-multi-repo --file publish-tt.yml --allow-publish --yes \
+  --registry=https://registry.npmjs.org
+```
+
+工作流使用 GitHub 托管的 runner、Node.js 24、npm 11.16.0 和 pnpm 11.1.2，
+并固定第三方 Action 的提交 SHA。当前 GitHub 仓库为私有仓库，因此不会生成
+npm provenance；这不影响 OIDC 发布。
+
+### 日常发布
+
+由 agent 代办时，直接说“发布 tt”即可；agent 按
+[发布 harness](AGENTS.md) 执行检查、发布、等待 npm 目标版本可用，并在本机
+全局安装该精确版本、验证 `tt --version`。无需用户自行执行下面的命令。
+
+先提交代码，确保整个 Git 仓库没有未提交或未跟踪的文件，并切换到 `main`。
+本地 `main` 可以有尚未推送的提交，但不能落后于远端或与远端分叉。
+
+```bash
+cd ~/work/local-multi-repo/template-commander
+pnpm pub
+```
+
+命令会运行源码测试、发布脚本测试、构建和 CLI 帮助检查，然后只修改本包的
+`package.json` 版本、创建发布提交和带注释的 `tt-v<版本>` 标签，原子推送
+`main` 与这个标签。其他包的标签不会随之推送。CI 会校验标签与包版本一致；
+普通代码推送不会触发 npm 发布。
+
+推送成功表示已触发 CI，最终结果以
+[Publish tt 工作流](https://github.com/imaoda/local-multi-repo/actions/workflows/publish-tt.yml)
+为准。等待本次发布结束再发布下一版；GitHub 的并发队列可能替换尚未开始的
+发布任务。发布后，在需要更新本机全局 `tt` 的电脑上运行 `pnpm upd`。
+
+### 失败后继续
+
+- 本地检查失败：先修复并提交，再运行 `pnpm pub`；检查失败不会递增版本。
+- 推送失败但发布提交和标签已生成：按终端提示修复网络或权限，在原发布提交上
+  运行 `pnpm pub --retry`，重推同一版本，避免再次递增。
+- 推送成功但 CI 失败：若只是 npm 信任配置错误，修正后在 Actions 中重跑失败的
+  工作流；若需修改代码，提交修复后通过 `pnpm pub` 发布新版本。
+
+不要在 CI 中运行 `pnpm pub`：它负责本地版本提交和推送，CI 的最终发布步骤是
+`npm publish`。已发布的版本不能重复发布。
+
+参见 [npm Trusted Publishing 文档](https://docs.npmjs.com/trusted-publishers/)。
+
+## Shell 快捷方式
+
+```bash
+# 在 ~/work/web-proxy 中先执行 w2 start，成功后执行 pnpm gateway
+tt sc w2
+```
+
+命令日志直接输出到当前终端，gateway 在前台运行。
+
 ## AI 音频生成
 
 `ai audio` 接受一段自然语言提示词并等待 XYQ 返回 MP3。参考音频可选；提供时，
@@ -187,6 +273,10 @@ return missingNameError();
 | `pnpm build` | TypeScript 编译 |
 | `pnpm start` | 运行编译后产物 |
 | `pnpm clean` | 清理 dist 目录 |
+| `pnpm test:release` | 在临时 Git 仓库中验证发布脚本 |
+| `pnpm pub` | 检查、升 patch 版本并推送 tt 标签，触发 CI 发布 |
+| `pnpm pub --retry` | 重推当前发布提交和标签，不递增版本 |
+| `pnpm upd` | 将本机全局 tt 更新到 npm 上的最新版本 |
 
 ## 技术栈
 

package/dist/main.js

@@ -2335,6 +2335,22 @@ var ShortcutEmoPippitCommand = class extends ShortcutBaseCommand {
   }
 };
 
+// src/commands/shortcut/shortcut-w2-command.ts
+import { homedir as homedir5 } from "node:os";
+import { join as join7 } from "node:path";
+var ShortcutW2Command = class extends ShortcutBaseCommand {
+  _meta() {
+    return {
+      name: "w2",
+      description: "\u542F\u52A8 web-proxy \u7684 whistle \u548C gateway"
+    };
+  }
+  async _execute(_ctx) {
+    const cwd = join7(homedir5(), "work", "web-proxy");
+    return this._runCommandLine("w2 start && pnpm gateway", cwd);
+  }
+};
+
 // src/commands/shortcut/shortcut-command.ts
 var ShortcutCommand = class extends BaseSubcommandHost {
   _meta() {
@@ -2348,6 +2364,7 @@ var ShortcutCommand = class extends BaseSubcommandHost {
     this._addSubcommand(new ShortcutEmoLynxCommand());
     this._addSubcommand(new ShortcutEmoPippitCommand());
     this._addSubcommand(new ShortcutEmoPippitCnCommand());
+    this._addSubcommand(new ShortcutW2Command());
   }
 };
 
@@ -2471,21 +2488,21 @@ var AiWebSearchCommand = class extends AiBaseCommand {
 };
 
 // src/commands/ai/ai-run-command.ts
-import { homedir as homedir6 } from "node:os";
-import { join as join8 } from "node:path";
+import { homedir as homedir7 } from "node:os";
+import { join as join9 } from "node:path";
 import { ok as ok15 } from "rockbed/error";
 
 // src/commands/ai/ai-context-path.ts
 import { existsSync as existsSync2 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join7 } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { join as join8 } from "node:path";
 import { err as err7, ok as ok14 } from "rockbed/error";
 function getCurrentCloudRootPath() {
   if (process.platform !== "darwin") {
     return err7(1, "`--my` \u4EC5\u652F\u6301\u5728 macOS \u4E0A\u4F7F\u7528");
   }
-  const cloudRootPath = join7(
-    homedir5(),
+  const cloudRootPath = join8(
+    homedir6(),
     "Library",
     "Mobile Documents",
     "com~apple~CloudDocs"
@@ -2513,7 +2530,7 @@ var AI_RUN_CONTEXT_ALIASES = [
         return cloudRoot;
       }
       return ensureDirectoryExists(
-        join8(cloudRoot.value, "icloud-hub", "local-knowlege-base")
+        join9(cloudRoot.value, "icloud-hub", "local-knowlege-base")
       );
     }
   },
@@ -2522,7 +2539,7 @@ var AI_RUN_CONTEXT_ALIASES = [
     optionDescription: "\u53C2\u8003 ~/work/smart-agent/dymamic-skills \u5B66\u4E60 skill",
     resolveReferenceDir: () => {
       return ensureDirectoryExists(
-        join8(homedir6(), "work", "smart-agent", "dynamic-skills")
+        join9(homedir7(), "work", "smart-agent", "dynamic-skills")
       );
     }
   }
@@ -3513,19 +3530,26 @@ var XyqSession = class {
     const normalizedInput = normalizedInputResult.value;
     const threadId = randomUUID3();
     const clientRunId = `canvas_run_${randomUUID3()}`;
+    const messageId = randomUUID3();
     const requestId = randomUUID3();
     const submittedAt = this._now();
+    const runExtra = buildVideoPartRunExtra(clientRunId, messageId);
     const body = buildSubmitVideoPartBody({
       ...normalizedInput,
       threadId,
       clientRunId,
+      messageId,
       requestId,
       submittedAt,
-      context: this.context
+      context: this.context,
+      runExtra
     });
+    const submitUrl = new URL(`${XYQ_ORIGIN}/api/biz/v1/agent/submit_run`);
+    const { generate_id: _generateId, ...queryBabiParam } = runExtra.babi_param;
+    submitUrl.searchParams.set("babi_param", JSON.stringify(queryBabiParam));
     const responseResult = await requestXyqJson(
       this._fetcher,
-      `${XYQ_ORIGIN}/api/biz/v1/agent/submit_run`,
+      submitUrl.toString(),
       {
         method: "POST",
         headers: {
@@ -3958,27 +3982,32 @@ function normalizeVideoAssetReferences(assets, label) {
   }
   return ok19(normalized);
 }
-function buildSubmitVideoPartBody(input) {
-  const babiParam = {
+function buildVideoPartRunExtra(clientRunId, messageId) {
+  return {
     babi_param: {
-      generate_id: input.clientRunId,
-      section_id: input.clientRunId,
+      generate_id: clientRunId,
+      user_message_id: messageId,
+      section_id: clientRunId,
       scene_lv1: "ai_agent",
       scene_lv2: "front_tool",
-      tool_id: "pippit_novel_video_part_agent",
+      tool_id: "novel_canvas",
       tab_name: "canvas",
-      edit_type: "video_part",
+      edit_type: "novel",
       enter_from: "web"
     },
     client_extra: {
-      edit_type: "video_part",
+      edit_type: "novel",
+      canvas_type: "novel",
       position: "canvas",
       entrance_from: "web",
       tab_name: "canvas",
       target: "video",
-      run_source: "video_part"
+      run_source: "video_part",
+      placement_name: "canvas"
     }
   };
+}
+function buildSubmitVideoPartBody(input) {
   const contentDataParam = {
     prompt: input.prompt,
     images: input.images,
@@ -4008,7 +4037,7 @@ function buildSubmitVideoPartBody(input) {
       thread_id: input.threadId,
       run_id: input.clientRunId,
       created_at: input.submittedAt,
-      message_id: ""
+      message_id: input.messageId
     },
     user_info: {
       consumer_uid: input.context.uid,
@@ -4018,7 +4047,7 @@ function buildSubmitVideoPartBody(input) {
     },
     agent_name: "pippit_novel_video_part_agent",
     entrance_from: "web",
-    run_extra: JSON.stringify(babiParam),
+    run_extra: JSON.stringify(input.runExtra),
     request_id: input.requestId
   };
 }
@@ -4856,7 +4885,7 @@ function describeUnsuccessfulTerminalState(state) {
 // src/commands/ai/ai-image-command-v2.ts
 import { spawn as spawn3 } from "node:child_process";
 import * as fs10 from "node:fs/promises";
-import { homedir as homedir9 } from "node:os";
+import { homedir as homedir10 } from "node:os";
 import * as path11 from "node:path";
 import { err as err10, ok as ok21 } from "rockbed/error";
 
@@ -4914,17 +4943,17 @@ var generateUuid = (() => {
 // src/commands/ai/ai-image-command-v2.ts
 var GENERATED_IMAGES_SUBDIR = "generated_imgs";
 var GENERATED_IMAGES_DIR = path11.join(
-  homedir9(),
+  homedir10(),
   ".codex",
   GENERATED_IMAGES_SUBDIR
 );
 var GENERATED_IMAGES_PROMPT_DIR = `~/.codex/${GENERATED_IMAGES_SUBDIR}`;
 var LEGACY_GENERATED_IMAGES_DIR = path11.join(
-  homedir9(),
+  homedir10(),
   ".codex",
   "generated_images"
 );
-var CODEX_EMPTY_WORKDIR = path11.join(homedir9(), ".codex-empty");
+var CODEX_EMPTY_WORKDIR = path11.join(homedir10(), ".codex-empty");
 var AiImageCommandV2 = class extends AiBaseCommand {
   _meta() {
     return {
@@ -6609,8 +6638,8 @@ async function readConfigValue2(settingsReader, key) {
 
 // src/commands/tool/tool-random-files-command.ts
 import { readdir as readdir2, stat as stat3 } from "node:fs/promises";
-import { homedir as homedir10 } from "node:os";
-import { extname as extname4, join as join13, resolve as resolve8 } from "node:path";
+import { homedir as homedir11 } from "node:os";
+import { extname as extname4, join as join14, resolve as resolve8 } from "node:path";
 var DEFAULT_COUNT = 1;
 var DEFAULT_SUFFIXES = ["png", "jpeg", "jpg"];
 var DEFAULT_DEPTH = 3;
@@ -6789,7 +6818,7 @@ async function collectMatchingFiles(options) {
   const entries = await safeReadDir(options.folder);
   const files = [];
   for (const entry of entries) {
-    const entryPath = join13(options.folder, entry.name);
+    const entryPath = join14(options.folder, entry.name);
     if (entry.isFile()) {
       if (hasAllowedSuffix(entry.name, options.suffixes)) {
         files.push(entryPath);
@@ -6841,10 +6870,10 @@ async function safeStat(path13) {
 }
 function expandHomeDir(path13) {
   if (path13 === "~") {
-    return homedir10();
+    return homedir11();
   }
   if (path13.startsWith("~/")) {
-    return join13(homedir10(), path13.slice(2));
+    return join14(homedir11(), path13.slice(2));
   }
   return resolve8(path13);
 }