chatccc 0.2.226 → 0.2.227

package/src/agent-activity.ts

@@ -1,170 +1,170 @@
-import type { UnifiedBlock } from "./adapters/adapter-interface.ts";
-
-export type AgentActivityKind =
-  | "starting"
-  | "thinking"
-  | "tool"
-  | "processing"
-  | "responding"
-  | "searching"
-  | "compacting";
-
-/** The user-visible activity of a running Agent turn. */
-export interface AgentActivity {
-  kind: AgentActivityKind;
-  /** Time when the current activity began, used for truthful elapsed time. */
-  startedAt: number;
-  toolName?: string;
-  toolCount?: number;
-}
-
-interface ActiveTool {
-  id: string;
-  name: string;
-  startedAt: number;
-}
-
-export interface AgentActivityTracker {
-  activity: AgentActivity;
-  activeTools: Map<string, ActiveTool>;
-  nextAnonymousToolId: number;
-}
-
-export function createAgentActivityTracker(now = Date.now()): AgentActivityTracker {
-  return {
-    activity: { kind: "starting", startedAt: now },
-    activeTools: new Map(),
-    nextAnonymousToolId: 1,
-  };
-}
-
-function sameVisibleActivity(left: AgentActivity, right: AgentActivity): boolean {
-  return left.kind === right.kind
-    && left.toolName === right.toolName
-    && left.toolCount === right.toolCount;
-}
-
-function setActivity(tracker: AgentActivityTracker, next: AgentActivity): boolean {
-  if (sameVisibleActivity(tracker.activity, next)) return false;
-  tracker.activity = next;
-  return true;
-}
-
-function refreshToolActivity(tracker: AgentActivityTracker): boolean {
-  const tools = [...tracker.activeTools.values()];
-  const first = tools[0];
-  if (!first) return false;
-  return setActivity(tracker, {
-    kind: "tool",
-    startedAt: first.startedAt,
-    toolName: first.name,
-    toolCount: tools.length,
-  });
-}
-
-function removeCompletedTool(tracker: AgentActivityTracker, toolUseId: string): void {
-  if (toolUseId && tracker.activeTools.delete(toolUseId)) return;
-
-  // Older adapters did not always include a tool ID. Prefer an anonymous entry;
-  // if there is only one active call, it is still safe to match that result.
-  const anonymousId = [...tracker.activeTools.keys()].find((id) => id.startsWith("anonymous:"));
-  if (anonymousId) {
-    tracker.activeTools.delete(anonymousId);
-  } else if (tracker.activeTools.size === 1) {
-    const onlyId = tracker.activeTools.keys().next().value as string | undefined;
-    if (onlyId) tracker.activeTools.delete(onlyId);
-  }
-}
-
-/**
- * Applies one normalized Agent event and returns whether the persisted activity
- * changed. Tool activity takes precedence while a tool call is still active.
- */
-export function updateAgentActivity(
-  tracker: AgentActivityTracker,
-  block: UnifiedBlock,
-  now = Date.now(),
-): boolean {
-  if (block.type === "tool_use") {
-    const id = block.id || `anonymous:${tracker.nextAnonymousToolId++}`;
-    const existing = tracker.activeTools.get(id);
-    tracker.activeTools.set(id, {
-      id,
-      name: block.name || "未知工具",
-      startedAt: existing?.startedAt ?? now,
-    });
-    return refreshToolActivity(tracker);
-  }
-
-  if (block.type === "tool_result") {
-    removeCompletedTool(tracker, block.tool_use_id);
-    if (tracker.activeTools.size > 0) return refreshToolActivity(tracker);
-    return setActivity(tracker, { kind: "processing", startedAt: now });
-  }
-
-  if (tracker.activeTools.size > 0) return false;
-
-  switch (block.type) {
-    case "thinking":
-    case "redacted_thinking":
-      return setActivity(tracker, { kind: "thinking", startedAt: now });
-    case "text":
-    case "text_final":
-      return setActivity(tracker, { kind: "responding", startedAt: now });
-    case "search_result":
-      return setActivity(tracker, { kind: "searching", startedAt: now });
-    case "compact_boundary":
-      return setActivity(tracker, { kind: "compacting", startedAt: now });
-  }
-}
-
-function formatElapsed(startedAt: number, now: number): string {
-  const totalSeconds = Math.max(0, Math.floor((now - startedAt) / 1000));
-  if (totalSeconds < 60) return `${totalSeconds}秒`;
-  const totalMinutes = Math.floor(totalSeconds / 60);
-  const seconds = totalSeconds % 60;
-  if (totalMinutes < 60) return `${totalMinutes}分${seconds}秒`;
-  const hours = Math.floor(totalMinutes / 60);
-  const minutes = totalMinutes % 60;
-  return `${hours}小时${minutes}分`;
-}
-
-function displayToolName(name: string | undefined): string {
-  const normalized = (name || "未知工具").replace(/\s+/g, " ").trim();
-  return normalized.length > 24 ? `${normalized.slice(0, 23)}…` : normalized;
-}
-
-export function formatAgentActivityTitle(
-  activity: AgentActivity | undefined,
-  now = Date.now(),
-): string {
-  if (!activity) return "正在处理";
-
-  let label: string;
-  switch (activity.kind) {
-    case "starting":
-      label = "正在启动 Agent";
-      break;
-    case "thinking":
-      label = "思考中";
-      break;
-    case "tool": {
-      const count = Math.max(1, activity.toolCount ?? 1);
-      label = `正在执行 ${displayToolName(activity.toolName)}${count > 1 ? ` 等 ${count} 项` : ""}`;
-      break;
-    }
-    case "processing":
-      label = "正在处理工具结果";
-      break;
-    case "responding":
-      label = "正在生成回复";
-      break;
-    case "searching":
-      label = "正在处理搜索结果";
-      break;
-    case "compacting":
-      label = "正在整理上下文";
-      break;
-  }
-  return `${label} · ${formatElapsed(activity.startedAt, now)}`;
-}
+import type { UnifiedBlock } from "./adapters/adapter-interface.ts";
+
+export type AgentActivityKind =
+  | "starting"
+  | "thinking"
+  | "tool"
+  | "processing"
+  | "responding"
+  | "searching"
+  | "compacting";
+
+/** The user-visible activity of a running Agent turn. */
+export interface AgentActivity {
+  kind: AgentActivityKind;
+  /** Time when the current activity began, used for truthful elapsed time. */
+  startedAt: number;
+  toolName?: string;
+  toolCount?: number;
+}
+
+interface ActiveTool {
+  id: string;
+  name: string;
+  startedAt: number;
+}
+
+export interface AgentActivityTracker {
+  activity: AgentActivity;
+  activeTools: Map<string, ActiveTool>;
+  nextAnonymousToolId: number;
+}
+
+export function createAgentActivityTracker(now = Date.now()): AgentActivityTracker {
+  return {
+    activity: { kind: "starting", startedAt: now },
+    activeTools: new Map(),
+    nextAnonymousToolId: 1,
+  };
+}
+
+function sameVisibleActivity(left: AgentActivity, right: AgentActivity): boolean {
+  return left.kind === right.kind
+    && left.toolName === right.toolName
+    && left.toolCount === right.toolCount;
+}
+
+function setActivity(tracker: AgentActivityTracker, next: AgentActivity): boolean {
+  if (sameVisibleActivity(tracker.activity, next)) return false;
+  tracker.activity = next;
+  return true;
+}
+
+function refreshToolActivity(tracker: AgentActivityTracker): boolean {
+  const tools = [...tracker.activeTools.values()];
+  const first = tools[0];
+  if (!first) return false;
+  return setActivity(tracker, {
+    kind: "tool",
+    startedAt: first.startedAt,
+    toolName: first.name,
+    toolCount: tools.length,
+  });
+}
+
+function removeCompletedTool(tracker: AgentActivityTracker, toolUseId: string): void {
+  if (toolUseId && tracker.activeTools.delete(toolUseId)) return;
+
+  // Older adapters did not always include a tool ID. Prefer an anonymous entry;
+  // if there is only one active call, it is still safe to match that result.
+  const anonymousId = [...tracker.activeTools.keys()].find((id) => id.startsWith("anonymous:"));
+  if (anonymousId) {
+    tracker.activeTools.delete(anonymousId);
+  } else if (tracker.activeTools.size === 1) {
+    const onlyId = tracker.activeTools.keys().next().value as string | undefined;
+    if (onlyId) tracker.activeTools.delete(onlyId);
+  }
+}
+
+/**
+ * Applies one normalized Agent event and returns whether the persisted activity
+ * changed. Tool activity takes precedence while a tool call is still active.
+ */
+export function updateAgentActivity(
+  tracker: AgentActivityTracker,
+  block: UnifiedBlock,
+  now = Date.now(),
+): boolean {
+  if (block.type === "tool_use") {
+    const id = block.id || `anonymous:${tracker.nextAnonymousToolId++}`;
+    const existing = tracker.activeTools.get(id);
+    tracker.activeTools.set(id, {
+      id,
+      name: block.name || "未知工具",
+      startedAt: existing?.startedAt ?? now,
+    });
+    return refreshToolActivity(tracker);
+  }
+
+  if (block.type === "tool_result") {
+    removeCompletedTool(tracker, block.tool_use_id);
+    if (tracker.activeTools.size > 0) return refreshToolActivity(tracker);
+    return setActivity(tracker, { kind: "processing", startedAt: now });
+  }
+
+  if (tracker.activeTools.size > 0) return false;
+
+  switch (block.type) {
+    case "thinking":
+    case "redacted_thinking":
+      return setActivity(tracker, { kind: "thinking", startedAt: now });
+    case "text":
+    case "text_final":
+      return setActivity(tracker, { kind: "responding", startedAt: now });
+    case "search_result":
+      return setActivity(tracker, { kind: "searching", startedAt: now });
+    case "compact_boundary":
+      return setActivity(tracker, { kind: "compacting", startedAt: now });
+  }
+}
+
+function formatElapsed(startedAt: number, now: number): string {
+  const totalSeconds = Math.max(0, Math.floor((now - startedAt) / 1000));
+  if (totalSeconds < 60) return `${totalSeconds}秒`;
+  const totalMinutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  if (totalMinutes < 60) return `${totalMinutes}分${seconds}秒`;
+  const hours = Math.floor(totalMinutes / 60);
+  const minutes = totalMinutes % 60;
+  return `${hours}小时${minutes}分`;
+}
+
+function displayToolName(name: string | undefined): string {
+  const normalized = (name || "未知工具").replace(/\s+/g, " ").trim();
+  return normalized.length > 24 ? `${normalized.slice(0, 23)}…` : normalized;
+}
+
+export function formatAgentActivityTitle(
+  activity: AgentActivity | undefined,
+  now = Date.now(),
+): string {
+  if (!activity) return "正在处理";
+
+  let label: string;
+  switch (activity.kind) {
+    case "starting":
+      label = "正在启动 Agent";
+      break;
+    case "thinking":
+      label = "思考中";
+      break;
+    case "tool": {
+      const count = Math.max(1, activity.toolCount ?? 1);
+      label = `正在执行 ${displayToolName(activity.toolName)}${count > 1 ? ` 等 ${count} 项` : ""}`;
+      break;
+    }
+    case "processing":
+      label = "正在处理工具结果";
+      break;
+    case "responding":
+      label = "正在生成回复";
+      break;
+    case "searching":
+      label = "正在处理搜索结果";
+      break;
+    case "compacting":
+      label = "正在整理上下文";
+      break;
+  }
+  return `${label} · ${formatElapsed(activity.startedAt, now)}`;
+}

package/src/agent-delegate-task.ts

@@ -1,91 +1,91 @@
-import { resolve } from "node:path";
-
-import { sessionPrefixForTool, toolDisplayName, ts } from "./config.ts";
-import { setDefaultCwd } from "./config.ts";
-import type { PlatformAdapter } from "./platform-adapter.ts";
-import {
-  getEffectiveFastModeForTool,
-  initClaudeSession,
-  recordSessionRegistry,
-  resumeAndPrompt,
-  saveSessionTool,
-} from "./session.ts";
-import { bindChatToSession } from "./session-chat-binding.ts";
-import { sessionChatName } from "./session-name.ts";
-
-export interface DelegateAgentTaskInput {
-  platform: PlatformAdapter;
-  tool: string;
-  cwd: string;
-  promptText: string;
-  openIds: string[];
-  chatNamePrefix?: string;
-  msgTimestamp?: number;
-  traceId?: string;
-}
-
-export interface DelegateAgentTaskResult {
-  chatId: string;
-  sessionId: string;
-  tool: string;
-  cwd: string;
-}
-
-export async function delegateAgentTask(input: DelegateAgentTaskInput): Promise<DelegateAgentTaskResult> {
-  const cwd = resolve(input.cwd);
-  const toolLabel = toolDisplayName(input.tool);
-  const init = await initClaudeSession(input.tool, cwd);
-  const sessionId = init.sessionId;
-  const chatNamePrefix = input.chatNamePrefix?.trim() || input.promptText.slice(0, 10) || "新会话";
-  const chatName = sessionChatName(chatNamePrefix, cwd);
-
-  let chatId: string;
-  try {
-    chatId = await input.platform.createGroup(chatName, input.openIds);
-    await input.platform.updateChatInfo(chatId, chatName, `${sessionPrefixForTool(input.tool)} ${sessionId}`);
-    await setDefaultCwd(cwd, chatId);
-    bindChatToSession(sessionId, chatId);
-    await recordSessionRegistry({
-      chatId,
-      sessionId,
-      tool: input.tool,
-      chatType: "group",
-      chatName,
-      turnCount: 0,
-      startTime: Date.now(),
-      running: false,
-    });
-    await saveSessionTool(sessionId, input.tool, chatName);
-  } catch (err) {
-    console.error(`[${ts()}] [AGENT-DELEGATE-TASK] create group failed: ${(err as Error).message}`);
-    throw err;
-  }
-
-  await input.platform.sendCard(
-    chatId,
-    `${toolLabel} Session Ready`,
-    `已创建 **${toolLabel}** 会话群。\n\n` +
-      `**Session ID:** ${sessionId}\n` +
-      `**工作目录:** \`${cwd}\`\n\n` +
-      `下面会自动把任务作为第一句话发送给 ${toolLabel}。`,
-    "green",
-  ).catch(() => {});
-  const fastMode = getEffectiveFastModeForTool(input.tool, sessionId);
-  const avatarUpdate = fastMode
-    ? input.platform.setChatAvatar(chatId, input.tool, "new", { fastMode: true })
-    : input.platform.setChatAvatar(chatId, input.tool, "new");
-  avatarUpdate.catch(() => {});
-
-  await resumeAndPrompt(
-    sessionId,
-    input.promptText,
-    input.platform,
-    chatId,
-    input.msgTimestamp ?? Date.now(),
-    input.tool,
-    input.traceId,
-  );
-
-  console.log(`[${ts()}] [AGENT-DELEGATE-TASK] created ${toolLabel} session=${sessionId} chat=${chatId} cwd=${cwd}`);
-  return { chatId, sessionId, tool: input.tool, cwd };
-}
+import { resolve } from "node:path";
+
+import { sessionPrefixForTool, toolDisplayName, ts } from "./config.ts";
+import { setDefaultCwd } from "./config.ts";
+import type { PlatformAdapter } from "./platform-adapter.ts";
+import {
+  getEffectiveFastModeForTool,
+  initClaudeSession,
+  recordSessionRegistry,
+  resumeAndPrompt,
+  saveSessionTool,
+} from "./session.ts";
+import { bindChatToSession } from "./session-chat-binding.ts";
+import { sessionChatName } from "./session-name.ts";
+
+export interface DelegateAgentTaskInput {
+  platform: PlatformAdapter;
+  tool: string;
+  cwd: string;
+  promptText: string;
+  openIds: string[];
+  chatNamePrefix?: string;
+  msgTimestamp?: number;
+  traceId?: string;
+}
+
+export interface DelegateAgentTaskResult {
+  chatId: string;
+  sessionId: string;
+  tool: string;
+  cwd: string;
+}
+
+export async function delegateAgentTask(input: DelegateAgentTaskInput): Promise<DelegateAgentTaskResult> {
+  const cwd = resolve(input.cwd);
+  const toolLabel = toolDisplayName(input.tool);
+  const init = await initClaudeSession(input.tool, cwd);
+  const sessionId = init.sessionId;
+  const chatNamePrefix = input.chatNamePrefix?.trim() || input.promptText.slice(0, 10) || "新会话";
+  const chatName = sessionChatName(chatNamePrefix, cwd);
+
+  let chatId: string;
+  try {
+    chatId = await input.platform.createGroup(chatName, input.openIds);
+    await input.platform.updateChatInfo(chatId, chatName, `${sessionPrefixForTool(input.tool)} ${sessionId}`);
+    await setDefaultCwd(cwd, chatId);
+    bindChatToSession(sessionId, chatId);
+    await recordSessionRegistry({
+      chatId,
+      sessionId,
+      tool: input.tool,
+      chatType: "group",
+      chatName,
+      turnCount: 0,
+      startTime: Date.now(),
+      running: false,
+    });
+    await saveSessionTool(sessionId, input.tool, chatName);
+  } catch (err) {
+    console.error(`[${ts()}] [AGENT-DELEGATE-TASK] create group failed: ${(err as Error).message}`);
+    throw err;
+  }
+
+  await input.platform.sendCard(
+    chatId,
+    `${toolLabel} Session Ready`,
+    `已创建 **${toolLabel}** 会话群。\n\n` +
+      `**Session ID:** ${sessionId}\n` +
+      `**工作目录:** \`${cwd}\`\n\n` +
+      `下面会自动把任务作为第一句话发送给 ${toolLabel}。`,
+    "green",
+  ).catch(() => {});
+  const fastMode = getEffectiveFastModeForTool(input.tool, sessionId);
+  const avatarUpdate = fastMode
+    ? input.platform.setChatAvatar(chatId, input.tool, "new", { fastMode: true })
+    : input.platform.setChatAvatar(chatId, input.tool, "new");
+  avatarUpdate.catch(() => {});
+
+  await resumeAndPrompt(
+    sessionId,
+    input.promptText,
+    input.platform,
+    chatId,
+    input.msgTimestamp ?? Date.now(),
+    input.tool,
+    input.traceId,
+  );
+
+  console.log(`[${ts()}] [AGENT-DELEGATE-TASK] created ${toolLabel} session=${sessionId} chat=${chatId} cwd=${cwd}`);
+  return { chatId, sessionId, tool: input.tool, cwd };
+}

package/src/builtin/cli.ts

@@ -13,13 +13,15 @@
 
 import * as readline from "node:readline";
 import * as process from "node:process";
-import { appendFileSync } from "node:fs";
-import { resolve as resolvePath } from "node:path";
+import { appendFileSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve as resolvePath } from "node:path";
 import { fileURLToPath } from "node:url";
 
 import { listBuiltinContextSessions } from "./context.js";
 import { resolveBuiltinSession, type BuiltinResumeRequest } from "./session-select.js";
 import { createCtrlCState } from "./sigint.js";
+import { buildSkillTemplate } from "./skills.js";
 import { reduceProgress } from "./progress/reducer.js";
 import { TerminalProgressRenderer } from "./progress/terminal-renderer.js";
 import { progressView, type ProgressView } from "./progress/view.js";
@@ -562,7 +564,64 @@ async function runRepl(args: ParsedArgs): Promise<void> {
   });
 }
 
+/**
+ * skill create 子命令：deepccc skill create <name> [--scope global|project] [--description "..."]
+ * 默认创建为全局技能（~/.deepccc/skills/<name>/SKILL.md，Codex 结构）；
+ * --scope project 创建为项目技能（<cwd>/.deepccc/skills/<name>/SKILL.md）。
+ * 新技能在下一次对话自动生效（技能索引每次 chat() 前重扫）。
+ */
+function runSkillCreate(argv: string[]): void {
+  const positional = argv.filter((a) => !a.startsWith("--"));
+  const name = positional[0];
+  if (!name) {
+    console.error(
+      "usage: deepccc skill create <name> [--scope global|project] [--description \"...\"]",
+    );
+    process.exit(1);
+  }
+  if (!/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(name)) {
+    console.error(`invalid skill name: ${name}（允许字母/数字/._-，不能以 . 或 - 开头）`);
+    process.exit(1);
+  }
+
+  const scopeIdx = argv.indexOf("--scope");
+  const scope = scopeIdx !== -1 && argv[scopeIdx + 1] === "project" ? "project" : "global";
+  const descIdx = argv.indexOf("--description");
+  const description = descIdx !== -1 ? (argv[descIdx + 1] ?? "") : "";
+
+  const base =
+    scope === "project"
+      ? join(process.cwd(), ".deepccc", "skills")
+      : join(homedir(), ".deepccc", "skills");
+  const skillPath = join(base, name, "SKILL.md");
+
+  if (existsSync(skillPath)) {
+    console.error(`skill already exists: ${skillPath}`);
+    process.exit(1);
+  }
+
+  try {
+    mkdirSync(join(base, name), { recursive: true });
+    writeFileSync(skillPath, buildSkillTemplate(name, description), "utf8");
+  } catch (err) {
+    console.error(`failed to create skill: ${(err as Error).message}`);
+    process.exit(1);
+  }
+
+  console.log(`created skill: ${skillPath}`);
+  console.log(`scope: ${scope === "project" ? "project（仅当前项目生效）" : "global（所有项目生效）"}`);
+  if (description) console.log(`description: ${description}`);
+  console.log("hot reload: 下一次对话自动生效，无需重启");
+}
+
 async function main(): Promise<void> {
+  // skill create 子命令：deepccc skill create <name> [--scope global|project] [--description "..."]
+  // 默认创建在全局 ~/.deepccc/skills（Codex 目录结构），--scope project 创建到 <cwd>/.deepccc/skills。
+  if (process.argv[2] === "skill" && process.argv[3] === "create") {
+    runSkillCreate(process.argv.slice(4));
+    return;
+  }
+
   const args = parseArgs();
 
   if (args.streamJson) {