Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(desktop): close built-in skill review gaps

xd-bobo07a229ef0ac5
diff --git a/apps/desktop/resources/system-skills/cindy-skill-creator/scripts/quick_validate.py b/apps/desktop/resources/system-skills/cindy-skill-creator/scripts/quick_validate.py
index ab475fbad3..c9fbaf2bcc 100644
--- a/apps/desktop/resources/system-skills/cindy-skill-creator/scripts/quick_validate.py
+++ b/apps/desktop/resources/system-skills/cindy-skill-creator/scripts/quick_validate.py
@@ -75,16 +75,17 @@ def validate_skill(skill_path):
if not isinstance(description, str):
return False, f"Description must be a string, got {type(description).__name__}"
description = description.strip()
+ if not description:
+ return False, "Description must not be empty"
if description.startswith("[TODO:"):
return False, "Description contains an unfinished TODO placeholder"
- if description:
- if "<" in description or ">" in description:
- return False, "Description cannot contain angle brackets (< or >)"
- if len(description) > 1024:
- return (
- False,
- f"Description is too long ({len(description)} characters). Maximum is 1024 characters.",
- )
+ if "<" in description or ">" in description:
+ return False, "Description cannot contain angle brackets (< or >)"
+ if len(description) > 1024:
+ return (
+ False,
+ f"Description is too long ({len(description)} characters). Maximum is 1024 characters.",
+ )
body = content[body_start:]
fence_marker = None
diff --git a/apps/desktop/src/main/bootstrap-electron.ts b/apps/desktop/src/main/bootstrap-electron.ts
index aab983f5d6..b54c5bf5c3 100644
--- a/apps/desktop/src/main/bootstrap-electron.ts
+++ b/apps/desktop/src/main/bootstrap-electron.ts
@@ -578,10 +578,12 @@ import { SkillhubMarketService } from './skillhub/marketService';
import { skillhubAutoSyncService } from './skillhub/autoSyncService';
import { rehydrateCloseSuppression } from './maker-host/rehydrateCloseSuppression.js';
import {
+ BUILT_IN_LEARN_SKILL_NAME,
builtInSkillDescriptors,
prepareBuiltInSkills,
resolveBundledSystemSkillsRoot,
} from './maker-host/built-in-skills.js';
+import { isCindySkillEnabled } from './skillhub/activationPreferences';
import { prepareSharedGlobalSkillLinks } from './maker-host/shared-global-skills.js';
// Maker Core 一阶段重构(新链路)—— 静态 import 避免 dynamic import 触发 vite chunking
// 让 imageProtocol 等需要 app.ready 前注册的模块跑在错误时机。getMaker() 是 lazy 的,
@@ -1046,7 +1048,7 @@ import {
resetGoalController,
getGoalTeardownGeneration,
} from './goal-host/index.js';
-import { startLearnHost, resetLearnController } from './learn-host/index.js';
+import { startLearnHost, getLearnController, resetLearnController } from './learn-host/index.js';
import { fetchHubSkillReference } from './learn-host/hubReference.js';
import { registerLearnIpc, broadcastLearnEvent } from './learn-host/registerIpc.js';
import { registerGoalHandlers, broadcastGoalStatus } from './maker-ipc/goal.js';
@@ -6091,11 +6093,19 @@ const registerIpcHandlers = () => {
// Desktop slash command registry —— 注册 /help /clear 等内置项,
// IPC 暴露见 maker-ipc/desktop-commands.ts (待 Step 5 添加)。
// 单例 + 幂等保护 (makerIpcsRegistered flag) 保证 builtins 只灌一次。
- // remoteInvoke:远程会话(ctx.deviceId)的 /goal /cmd 业务体经隧道路由
+ // remoteInvoke:远程会话(ctx.deviceId)的 /goal /learn /cmd 业务体经隧道路由
// 到被控端 —— 走与 renderer deviceLink.invoke 同一条 handleInvoke 主路径
// (控制开关校验 + 错误映射一致)。
registerBuiltinDesktopCommands(getDesktopCommandRegistry(), {
getGoalController,
+ getLearnController,
+ isLearnEnabled: () => {
+ const descriptor = builtInSkillDescriptors(
+ app.getPath('userData'),
+ app.getPath('appData'),
+ ).find((skill) => skill.name === BUILT_IN_LEARN_SKILL_NAME);
+ return descriptor ? isCindySkillEnabled(descriptor.absolutePath) : false;
+ },
remoteInvoke: (deviceId, channel, args) =>
deviceLinkHandleInvoke(deviceLinkIpcDeps(), deviceId, channel, args),
});
diff --git a/apps/desktop/src/main/commands/__tests__/builtinsRemoteRouting.test.ts b/apps/desktop/src/main/commands/__tests__/builtinsRemoteRouting.test.ts
index b10b3f4a0a..c47cfb751e 100644
--- a/apps/desktop/src/main/commands/__tests__/builtinsRemoteRouting.test.ts
+++ b/apps/desktop/src/main/commands/__tests__/builtinsRemoteRouting.test.ts
@@ -2,7 +2,7 @@
* builtinsRemoteRouting.test.ts
* ---------------------------------------------------------------------------
* desktop 命令按会话归属路由的回归:ctx.deviceId 存在(device-link 远程会话)时,
- * /goal /cmd 的业务体必须经 deps.remoteInvoke 隧道到被控端对应 channel,
+ * /goal /learn /cmd 的业务体必须经 deps.remoteInvoke 隧道到被控端对应 channel,
* 且**不**触碰本机 controller;本机会话(无 deviceId)行为与改造前一致。
* 错误分类:隧道 `[CODE] message` 编码与本机 err.code 收敛到同一套。
*/
@@ -37,15 +37,19 @@ function sentPayloads(): Payload[] {
function makeHarness(overrides?: {
remoteInvoke?: (deviceId: string, channel: string, args: unknown[]) => Promise<unknown>;
+ isLearnEnabled?: () => boolean;
}) {
const registry = new DesktopCommandRegistry();
const goalController = { setGoal: vi.fn(), clearGoal: vi.fn() };
+ const learnController = { startLearn: vi.fn(async () => ({ runId: 'local-run' })) };
const remoteInvoke = vi.fn(overrides?.remoteInvoke ?? (async () => ({})));
registerBuiltinDesktopCommands(registry, {
getGoalController: () => goalController as never,
+ getLearnController: () => learnController as never,
+ isLearnEnabled: overrides?.isLearnEnabled ?? (() => true),
remoteInvoke,
});
- return { registry, goalController, remoteInvoke };
+ return { registry, goalController, learnController, remoteInvoke };
}
beforeEach(() => {
@@ -61,7 +65,7 @@ describe('/cindy-make composer entry', () => {
description: expect.stringContaining('/cindy-make'),
});
expect(registry.list().some((command) => command.name === 'cindy-maker')).toBe(false);
- expect(registry.list().some((command) => command.name === 'learn')).toBe(false);
+ expect(registry.list().some((command) => command.name === 'learn')).toBe(true);
});
it.each([undefined, 'remote-device'])(
@@ -77,6 +81,28 @@ describe('/cindy-make composer entry', () => {
);
});
+describe('/learn SSH fallback', () => {
+ it('routes to the local Learn host for an SSH-backed session', async () => {
+ const { registry, learnController, remoteInvoke } = makeHarness();
+ await registry.execute('learn', { sessionId: 'ssh-session', args: '学习部署流程' });
+ expect(learnController.startLearn).toHaveBeenCalledWith({
+ input: '学习部署流程',
+ sourceKind: 'freetext',
+ originSessionId: 'ssh-session',
+ });
+ expect(remoteInvoke).not.toHaveBeenCalled();
+ expect(sentPayloads().at(-1)).toMatchObject({ command: 'learn', learnRunId: 'local-run' });
+ });
+
+ it('follows the Learn Skill activation preference', async () => {
+ const { registry } = makeHarness({ isLearnEnabled: () => false });
+ expect(registry.list().some((command) => command.name === 'learn')).toBe(false);
+ await expect(registry.execute('learn', { sessionId: 'ssh-session' })).rejects.toThrow(
+ 'unknown command "/learn"',
+ );
+ });
+});
+
describe('/goal 远程路由', () => {
it('deviceId + objective → 隧道 maker:goal:set,不触本机 controller', async () => {
const { registry, goalController, remoteInvoke } = makeHarness();
diff --git a/apps/desktop/src/main/commands/builtins.ts b/apps/desktop/src/main/commands/builtins.ts
index 710f752583..abc590b715 100644
--- a/apps/desktop/src/main/commands/builtins.ts
+++ b/apps/desktop/src/main/commands/builtins.ts
@@ -26,9 +26,10 @@ import { resolveMakeRuntime } from '../cindy-make/runtimeVersion.js';
import { makeToolRoot } from '../cindy-make/toolInstaller.js';
import { makeSourceRoot, prepareCindySource } from '../cindy-make/sourcePreparation.js';
import type { MakeDoctorReport } from '../../shared/cindyMakeDoctor.js';
-// type-only:不引入对 goal-host 的运行时依赖(避免潜在 import 环),
-// 运行时实例由 bootstrap 经 deps.getGoalController 注入。
+// type-only:不引入对 goal-host / learn-host 的运行时依赖(避免潜在 import 环),
+// 运行时实例由 bootstrap 经 deps.getGoalController / getLearnController 注入。
import type { GoalController } from '../goal-host/controller.js';
+import type { LearnController } from '../learn-host/controller.js';
import type { DesktopCommandContext, DesktopCommandRegistry } from './registry.js';
const log = createLogger('desktop-commands');
@@ -50,6 +51,7 @@ export interface DesktopCommandTriggeredPayload {
| 'jump-session'
| 'goal'
| 'workflows'
+ | 'learn'
| 'cindy-make-doctor'
| 'cindy-make';
doctorReport?: MakeDoctorReport;
@@ -58,12 +60,14 @@ export interface DesktopCommandTriggeredPayload {
args?: string;
/** /cmd 专用 —— shell 命令执行结果。其它命令此字段不存在。 */
result?: CmdExecutionResult;
- /** /goal 专用 —— 错误码(renderer 据此显示用法/错误提示):
- * goal-usage / goal-no-session / goal-failed;
+ /** /goal、/learn 共用 —— 错误码(renderer 据此显示用法/错误提示):
+ * goal-usage / goal-no-session / goal-failed;learn-usage / learn-busy / learn-failed;
* remote-unsupported(远程会话:被控端版本过旧,不支持该命令的隧道 channel)。 */
error?: string;
/** /goal 专用 —— 动作:'set'(已设目标)/ 'cleared'(已清除)/ 'open-dialog'(无参 /goal → renderer 打开新建目标弹窗)。GoalIndicator 由状态 push 驱动,set/cleared 仅用于插一张确认卡。 */
goalAction?: 'set' | 'cleared' | 'open-dialog';
+ /** /learn 专用 —— 启动成功时的 runId(renderer 据此关联 learn:event 状态流)。 */
+ learnRunId?: string;
}
export interface CmdExecutionResult {
@@ -336,9 +340,13 @@ const GOAL_CLEAR_ALIASES = new Set(['clear', 'stop', 'off', 'cancel', 'reset', '
export interface BuiltinDesktopCommandDeps {
/** null-safe 取 GoalController 单例(注册早于 startGoalController,invoke 时已就绪)。 */
getGoalController: () => GoalController | null;
+ /** null-safe 取 LearnController 单例(同 goal:注册早于 startLearnHost)。 */
+ getLearnController: () => LearnController | null;
+ /** Learn Skill 的设备/profile 开关;SSH 兼容入口与 Skill 使用同一开关。 */
+ isLearnEnabled: () => boolean;
/**
* device-link 隧道 invoke(控制端 → 被控端)。ctx.deviceId 存在(远程会话)时,
- * /goal /cmd 的业务体经它路由到被控端执行 —— 与 renderer 的
+ * /goal /learn /cmd 的业务体经它路由到被控端执行 —— 与 renderer 的
* deviceLink.invoke 走同一条 handleInvoke 主路径(含控制开关校验 + 错误映射,
* 失败抛 `[CODE] message` 形态 Error)。bootstrap 注入,避免 builtins 直接
* import device-link 运行时(与 getGoalController 同款解耦)。
@@ -347,7 +355,7 @@ export interface BuiltinDesktopCommandDeps {
}
/**
- * 从错误对象提取错误码:优先取 `.code`(本机 GoalControllerInputError),
+ * 从错误对象提取错误码:优先取 `.code`(本机 LearnError / GoalControllerInputError),
* 回退解析 throwIpcError 的 `[CODE] message` 编码(隧道透传的被控端错误)。
* 本机与远程两条错误链路因此在调用点收敛成同一套分类逻辑。
*/
@@ -685,6 +693,59 @@ export function registerBuiltinDesktopCommands(
},
});
+ registry.register({
+ // 本地 Agent 能扫描 Skill 时,renderer 会让同名 agent-skill 覆盖此入口;
+ // SSH 会话无法读取远端 Skill 清单,保留这条旧路由作为兼容入口。
+ name: 'learn',
+ description:
+ 'Distill a reusable skill from anything you describe (a workflow, a repo, a URL, how you usually do X) — grounded in your usage history and profile, reviewed as a diff before saving. Bare /learn distills the current conversation; /learn hub:<slug> learns from a SkillHub skill. Usage: /learn [hub:<slug>] [what to learn]',
+ isVisible: deps.isLearnEnabled,
+ execute: async (ctx) => {
+ const arg = (ctx.args ?? '').trim();
+ if (!arg && !ctx.sessionId) {
+ sendDesktopCommandToSender(ctx, { ...buildPayload('learn', ctx), error: 'learn-usage' });
+ return;
+ }
+ const controller = ctx.deviceId ? null : deps.getLearnController();
+ if (!ctx.deviceId && !controller) {
+ sendDesktopCommandToSender(ctx, { ...buildPayload('learn', ctx), error: 'learn-failed' });
+ return;
+ }
+ const hubMatch = /^hub:(?:(market|team):)?([a-z0-9][a-z0-9-]*)\s*/.exec(arg);
+ const req = hubMatch
+ ? {
+ input: arg.slice(hubMatch[0].length).trim(),
+ sourceKind: 'hub' as const,
+ hubSlug: hubMatch[2],
+ ...(hubMatch[1] ? { hubCatalogScope: hubMatch[1] as 'market' | 'team' } : {}),
+ ...(ctx.sessionId ? { originSessionId: ctx.sessionId } : {}),
+ }
+ : {
+ input: arg,
+ sourceKind: (arg ? 'freetext' : 'session') as 'freetext' | 'session',
+ ...(ctx.sessionId ? { originSessionId: ctx.sessionId } : {}),
+ };
+ try {
+ const { runId } = ctx.deviceId
+ ? ((await deps.remoteInvoke(ctx.deviceId, 'learn:start', [req])) as { runId: string })
+ : await controller!.startLearn(req);
+ sendDesktopCommandToSender(ctx, { ...buildPayload('learn', ctx), learnRunId: runId });
+ } catch (err) {
+ const code = extractErrorCode(err);
+ log.warn('/learn startLearn failed', err);
+ sendDesktopCommandToSender(ctx, {
+ ...buildPayload('learn', ctx),
+ error:
+ code === 'LEARN_BUSY'
+ ? 'learn-busy'
+ : isRemoteUnsupported(err)
+ ? 'remote-unsupported'
+ : 'learn-failed',
+ });
+ }
+ },
+ });
+
registry.register({
name: 'workflows',
description:
diff --git a/apps/desktop/src/main/commands/registry.ts b/apps/desktop/src/main/commands/registry.ts
index dc7bdbb7d4..682ace6339 100644
--- a/apps/desktop/src/main/commands/registry.ts
+++ b/apps/desktop/src/main/commands/registry.ts
@@ -56,6 +56,8 @@ export interface DesktopCommandContext extends MakeDoctorCommandContext {
export interface DesktopCommandDefinition {
name: string;
description: string;
+ /** Optional dynamic gate for commands backed by a user-toggleable capability. */
+ isVisible?: () => boolean;
/**
* 主入口 —— 命中此命令时由 main 执行。
* 同步/异步皆可; 抛错由调用方 catch + 上报, 不会自动 swallow。
@@ -79,11 +81,13 @@ export class DesktopCommandRegistry {
* 与 maker-core 的 DesktopCommandMeta 形状一致, palette 直接消费。
*/
list(): DesktopCommandMeta[] {
- return Array.from(this.commands.values()).map((c) => ({
- kind: 'desktop' as const,
- name: c.name,
- description: c.description,
- }));
+ return Array.from(this.commands.values())
+ .filter((c) => c.isVisible?.() !== false)
+ .map((c) => ({
+ kind: 'desktop' as const,
+ name: c.name,
+ description: c.description,
+ }));
}
/**
@@ -92,7 +96,7 @@ export class DesktopCommandRegistry {
*/
async execute(name: string, ctx: DesktopCommandContext): Promise<unknown> {
const cmd = this.commands.get(name);
- if (!cmd) {
+ if (!cmd || cmd.isVisible?.() === false) {
throw new Error(`DesktopCommandRegistry: unknown command "/${name}"`);
}
return cmd.execute(ctx);
diff --git a/apps/desktop/src/main/skillhub/__tests__/registerIpcUsage.test.ts b/apps/desktop/src/main/skillhub/__tests__/registerIpcUsage.test.ts
index 96e495da75..a9238d1d99 100644
--- a/apps/desktop/src/main/skillhub/__tests__/registerIpcUsage.test.ts
+++ b/apps/desktop/src/main/skillhub/__tests__/registerIpcUsage.test.ts
@@ -374,6 +374,56 @@ describe('registerSkillhubIpc usage handlers', () => {
expect(afterDestroy).toMatchObject({ success: false });
});
+ it('grants read-only access to a Main-attested built-in with no discovery alias', async () => {
+ const builtInRoot = path.join(fixtureRoot, 'shared-system-skills', 'learn');
+ const builtInFile = path.join(builtInRoot, 'SKILL.md');
+ fs.mkdirSync(builtInRoot, { recursive: true });
+ fs.writeFileSync(builtInFile, '# Learn\n');
+ const sender = { id: 18, on: vi.fn(), once: vi.fn() };
+ resolveExistingSkillPathForGrant.mockReturnValue(null);
+ isExistingSkillPathGranted.mockReturnValue(false);
+ scanAllSkills.mockResolvedValueOnce({
+ skills: [{
+ id: 'builtin:learn',
+ kind: 'skill',
+ name: 'learn',
+ absolutePath: builtInRoot,
+ discoveredPath: builtInRoot,
+ discoveryPaths: [builtInRoot],
+ scope: 'global',
+ builtIn: true,
+ }],
+ sources: [],
+ });
+ readSkillContent.mockResolvedValue({ success: true, content: 'Learn' });
+ const { registerSkillhubIpc } = await import('../registerIpc');
+ registerSkillhubIpc({
+ getMaker: () => ({ listAgentSkills }) as never,
+ getManagedSkillRoots,
+ getBuiltInSkills: () => [{
+ name: 'learn',
+ absolutePath: builtInRoot,
+ nativeClaudePath: '/tmp/claude-home/skills/learn',
+ }],
+ getAllowedProjectRoots,
+ marketService: marketService as never,
+ publishService: { publish, cancel } as never,
+ });
+
+ await handlers.get('skillhub:scan')?.({ sender }, { projects: [] });
+ await expect(handlers.get('skillhub:read-skill')?.(
+ { sender },
+ { mdPath: builtInFile },
+ )).resolves.toMatchObject({ success: true, content: 'Learn' });
+ expect(readSkillContent).toHaveBeenCalledWith({ mdPath: builtInFile });
+
+ await expect(handlers.get('skillhub:write-file')?.(
+ { sender },
+ { filePath: builtInFile, content: '# changed' },
+ )).resolves.toMatchObject({ success: false, error: expect.stringContaining('read-only') });
+ expect(writeSkillFile).not.toHaveBeenCalled();
+ });
+
it.each(['unchanged', 'grant-wait', 'mutation-wait', 'boundary-pending'] as const)(
'guards local rename at its original owner generation: %s', async (transition) => {
const sender = { id: 71, on: vi.fn(), once: vi.fn() };
diff --git a/apps/desktop/src/main/skillhub/registerIpc.ts b/apps/desktop/src/main/skillhub/registerIpc.ts
index d924cfa5e4..50b5cf37fa 100644
--- a/apps/desktop/src/main/skillhub/registerIpc.ts
+++ b/apps/desktop/src/main/skillhub/registerIpc.ts
@@ -62,6 +62,7 @@ interface ScannedSkillGrant {
entries: Array<{
root: string;
projectRootKey?: string;
+ builtIn?: boolean;
}>;
}
@@ -235,6 +236,7 @@ export function registerSkillhubIpc(options: RegisterSkillhubIpcOptions): void {
if (skill.scope === 'project' && !skillProjectRootKey) continue;
// discoveredPath preserves an allowed lexical alias when absolutePath was
// canonicalized through a parent-directory symlink.
+ let remembered = false;
for (const candidate of [skill.discoveredPath, skill.absolutePath]) {
const root = resolveExistingSkillPathForGrant(candidate);
if (root) {
@@ -246,9 +248,21 @@ export function registerSkillhubIpc(options: RegisterSkillhubIpcOptions): void {
...(skillProjectRootKey ? { projectRootKey: skillProjectRootKey } : {}),
});
}
+ remembered = true;
break;
}
}
+ // Scanner may inject the official copy when a same-name user Skill owns
+ // every normal discovery alias. Authorize only the exact physical root
+ // supplied by Main so its detail/files view remains readable.
+ if (!remembered) {
+ const root = configuredBuiltInRoot(skill.absolutePath);
+ const entryKey = root ? `${root}\0built-in` : null;
+ if (root && entryKey && !seenEntries.has(entryKey)) {
+ seenEntries.add(entryKey);
+ entries.push({ root, builtIn: true });
+ }
+ }
}
scannedSkillRootsBySender.set(event.sender.id, { ownerId, entries });
const records = skills.flatMap((skill) => {
@@ -290,8 +304,10 @@ export function registerSkillhubIpc(options: RegisterSkillhubIpcOptions): void {
if (grant) scannedSkillRootsBySender.delete(event.sender.id);
return Promise.resolve(false);
}
- const matchingEntries = grant.entries.filter(({ root }) => (
- isExistingSkillPathGranted(targetPath, new Set([root]))
+ const matchingEntries = grant.entries.filter(({ root, builtIn }) => (
+ builtIn
+ ? isSameOrInside(realPathOrResolved(targetPath), root)
+ : isExistingSkillPathGranted(targetPath, new Set([root]))
));
if (matchingEntries.length === 0) return Promise.resolve(false);
if (matchingEntries.some(({ projectRootKey: key }) => !key)) return Promise.resolve(true);
@@ -331,6 +347,13 @@ export function registerSkillhubIpc(options: RegisterSkillhubIpcOptions): void {
&& !path.isAbsolute(relative)
);
};
+ const configuredBuiltInRoot = (source: string): string | null => {
+ const physicalSource = realPathOrResolved(source);
+ const descriptor = (options.getBuiltInSkills?.() ?? []).find((skill) => (
+ realPathOrResolved(skill.absolutePath) === physicalSource
+ ));
+ return descriptor ? realPathOrResolved(descriptor.absolutePath) : null;
+ };
const isBuiltInSkillPath = (targetPath: string): boolean => (
(options.getBuiltInSkills?.() ?? []).some((skill) => {
const root = realPathOrResolved(skill.absolutePath);
diff --git a/apps/desktop/src/renderer/__tests__/slashCommandsDeviceId.test.ts b/apps/desktop/src/renderer/__tests__/slashCommandsDeviceId.test.ts
index 7eef41cd24..f9b8edb8cf 100644
--- a/apps/desktop/src/renderer/__tests__/slashCommandsDeviceId.test.ts
+++ b/apps/desktop/src/renderer/__tests__/slashCommandsDeviceId.test.ts
@@ -16,10 +16,10 @@ function c(name: string, kind: string) {
}
function stubElectron() {
- // desktop 含 goal:device-link 远程会话下同样保留(main 按 ctx.deviceId 隧道路由到被控端)。
+ // desktop 含 goal / learn;正常会话由 agent-skill 覆盖/替代 learn,SSH 才保留兼容入口。
const listDesktopCommands = vi.fn(async () => ({
success: true,
- commands: [c('help', 'desktop'), c('goal', 'desktop')],
+ commands: [c('help', 'desktop'), c('goal', 'desktop'), c('learn', 'desktop')],
}));
const listAgentCommands = vi.fn(async () => ({
success: true,
@@ -86,6 +86,7 @@ describe('loadAllCommands deviceId', () => {
expect.anything(),
);
expect(cmds.some((x) => x.kind === 'agent-skill')).toBe(false);
+ expect(cmds).toContainEqual(expect.objectContaining({ name: 'learn', kind: 'desktop' }));
});
it('SSH remote 新 Pi 对话不请求控制端本机包预览', async () => {
diff --git a/apps/desktop/src/renderer/lib/slashCommands.ts b/apps/desktop/src/renderer/lib/slashCommands.ts
index e7288e2b88..c5d9f01ed7 100644
--- a/apps/desktop/src/renderer/lib/slashCommands.ts
+++ b/apps/desktop/src/renderer/lib/slashCommands.ts
@@ -201,10 +201,10 @@ export function isSlashCommandRosterReady(
}
// device-link 远程会话下 desktop 命令**全量可用**:业务语义在「会话归属设备」的命令
-// (/goal /cmd)由控制端 main(commands/builtins.ts)按 ctx.deviceId 经隧道路由
-// 到被控端对应 channel(maker:goal:* / desktop-cmd:run,均在 REMOTE_INVOKE_ALLOWLIST);
+// (/goal /learn /cmd)由控制端 main(commands/builtins.ts)按 ctx.deviceId 经隧道路由
+// 到被控端对应 channel(maker:goal:* / learn:* / desktop-cmd:run,均在 REMOTE_INVOKE_ALLOWLIST);
// 纯控制端 UI 命令(/help /clear /workflows /jump-session /issue)本就与会话归属无关。
-// /learn 是被控端 Agent 暴露的 Skill,通过同机 cindy_helper 启动 Learn host,不走此路径。
+// 正常会话由 agent-skill /learn 覆盖兼容入口;SSH 无法扫描远端 Skill 时保留 Desktop 路由。
// 历史上这里有一张 DEVICE_LINK_UNAVAILABLE 黑名单(goal/learn,reviewer #354 / Codex #483
// 时代控制端还没有隧道路由)—— 隧道链路打通后已删除;被控端版本过旧不支持对应 channel 时,
// main 会广播 error: 'remote-unsupported',renderer toast 提示,不再静默剔除命令。
@@ -372,7 +372,12 @@ export async function loadAllCommands(
opts?.onPiRuntimeStatus?.(builtinRes.runtimeStatus);
}
- const desktop = (desktopRes.success && desktopRes.commands ? desktopRes.commands : []) as UnifiedCommand[];
+ const rawDesktop = (desktopRes.success && desktopRes.commands ? desktopRes.commands : []) as UnifiedCommand[];
+ // Learn 已迁成可开关的官方 Skill。本地/Device Link 能读 Skill 清单时只展示
+ // agent-skill;SSH 显式跳过扫描,才使用仍可路由 Learn host 的 Desktop 兼容入口。
+ const desktop = shouldLoadSkills
+ ? rawDesktop.filter((command) => command.name !== 'learn')
+ : rawDesktop;
const agentBuiltin = (builtinRes.success && builtinRes.commands ? builtinRes.commands : []) as UnifiedCommand[];
const agentSkill = (skillRes.success && skillRes.skills ? skillRes.skills : []) as UnifiedCommand[];
return mergeCommands(desktop, agentBuiltin, agentSkill);
@@ -473,7 +478,7 @@ export interface DispatchContext {
workingDir?: string;
/** `/name args...` 中 name 后面的剩余文本; 没有则空串。 */
args?: string;
- /** device-link 远程会话的归属设备 id(本机会话缺省)。main 侧 /goal /cmd
+ /** device-link 远程会话的归属设备 id(本机会话缺省)。main 侧 /goal /learn /cmd
* 据此把业务体经隧道路由到被控端执行。 */
deviceId?: string;
}