(maka) branch main updated: fix(ci): restore main validation after concurrent merges (#4504)

[wy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

M4n5ter pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/maka.git


The following commit(s) were added to refs/heads/main by this push:
     new e2e597c1ed fix(ci): restore main validation after concurrent merges (#4504)
e2e597c1ed is described below

commit e2e597c1ed3bdbacbba4324ebd2fc205a90a8913
Author: Xiao Liu <li...@qq.com>
AuthorDate: Wed Sep 2 08:21:04 2026 +0800

    fix(ci): restore main validation after concurrent merges (#4504)
    
    Generated-by: Codex
---
 .github/workflows/ci.yml             | 2 +-
 packages/cli/src/pi-tui-runner.ts    | 2 +-
 packages/cli/src/tui-copy-catalog.ts | 2 ++
 packages/cli/src/tui-copy-command.ts | 2 ++
 scripts/check-tui-copy.mjs           | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 844cf76e85..155333837e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -173,7 +173,7 @@ jobs:
         run: npm ci
 
       - name: Check localized TUI copy boundaries
-        if: needs.plan.outputs.code == 'true'
+        if: steps.plan.outputs.code == 'true'
         run: |
           npm run check:tui-copy
           node --test scripts/check-tui-copy.test.mjs
diff --git a/packages/cli/src/pi-tui-runner.ts b/packages/cli/src/pi-tui-runner.ts
index ca20558c21..b025e7c572 100644
--- a/packages/cli/src/pi-tui-runner.ts
+++ b/packages/cli/src/pi-tui-runner.ts
@@ -3313,7 +3313,7 @@ export async function runMakaPiTui(input: MakaPiTuiInput): Promise<void> {
           state.entries.push({
             kind: 'notice',
             level: 'error',
-            text: 'Usage: /copy [all]',
+            text: copyCopy.usage,
           });
           requestRender();
           return;
diff --git a/packages/cli/src/tui-copy-catalog.ts b/packages/cli/src/tui-copy-catalog.ts
index a4c2e12519..948acfecaa 100644
--- a/packages/cli/src/tui-copy-catalog.ts
+++ b/packages/cli/src/tui-copy-catalog.ts
@@ -27,6 +27,7 @@ export const TUI_COPY_RESOURCES = {
       tooLarge:
         'Too large to copy over OSC 52 · {bytes} bytes exceeds the {limit}-byte limit; a larger payload is silently dropped by the terminal.',
       nothingToCopy: 'Nothing to copy yet.',
+      usage: 'Usage: /copy [all]',
       roleUser: 'You:',
       roleAssistant: 'Maka:',
       roleGoalContinuation: 'Goal continuation (autonomous):',
@@ -40,6 +41,7 @@ export const TUI_COPY_RESOURCES = {
       tooLarge:
         '内容过大，无法复制 · {bytes} 字节超过 {limit} 字节上限；更大的内容会被终端静默丢弃。',
       nothingToCopy: '暂无可复制的内容。',
+      usage: '用法：/copy [all]',
       roleUser: '你：',
       roleAssistant: 'Maka：',
       roleGoalContinuation: '目标续跑（自主）：',
diff --git a/packages/cli/src/tui-copy-command.ts b/packages/cli/src/tui-copy-command.ts
index 120a2b441d..be20978ef0 100644
--- a/packages/cli/src/tui-copy-command.ts
+++ b/packages/cli/src/tui-copy-command.ts
@@ -42,6 +42,8 @@ export interface TuiCopyCopy {
   readonly tooLarge: string;
   /** Shown when there is nothing to copy yet. */
   readonly nothingToCopy: string;
+  /** Shown when `/copy` receives an unsupported argument. */
+  readonly usage: string;
   /** Role label for user turns in `/copy all`. */
   readonly roleUser: string;
   /** Role label for assistant turns in `/copy all`. */
diff --git a/scripts/check-tui-copy.mjs b/scripts/check-tui-copy.mjs
index f7baeab378..b9bcf2ee82 100644
--- a/scripts/check-tui-copy.mjs
+++ b/scripts/check-tui-copy.mjs
@@ -37,6 +37,7 @@ export const COVERED_FILES = [
   'packages/cli/src/runtime-host-onboarding.ts',
   'packages/cli/src/runtime-host-tui-command.ts',
   'packages/cli/src/tui-attention.ts',
+  'packages/cli/src/tui-copy-command.ts',
   'packages/cli/src/tui-shortcut-copy.ts',
   'packages/cli/src/pi-tui-layout.ts',
 ];
@@ -46,6 +47,7 @@ export const EXCLUDED_TUI_FILES = [
   'packages/cli/src/runtime-host-tui-context.ts',
   'packages/cli/src/tui-ansi.ts',
   'packages/cli/src/tui-autocomplete-layout.ts',
+  'packages/cli/src/tui-clipboard.ts',
   'packages/cli/src/tui-copy-catalog.ts',
   'packages/cli/src/tui-diff.ts',
   'packages/cli/src/tui-mcp-control.ts',


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org