chatccc 0.2.268 → 0.2.270

package/dist/src/agent-delegate-task-rpc.js

@@ -1,4 +1,5 @@
 import { resolve } from "node:path";
+import { homedir } from "node:os";
 import { resolveDefaultAgentTool } from "./config.js";
 import { readUtf8JsonBody } from "./agent-rpc-body.js";
 import { delegateAgentTask } from "./agent-delegate-task.js";
@@ -6,7 +7,7 @@ import { applySharedPrefix } from "./shared-prefix.js";
 import { beginSafeMaintenanceTrackedWork, isSafeMaintenanceAdmissionClosed, } from "./safe-maintenance.js";
 export const AGENT_DELEGATE_TASK_PATH = "/api/agent/delegate-task";
 const MAX_REQUEST_BYTES = 128 * 1024;
-const VALID_TOOLS = new Set(["claude", "cursor", "codex"]);
+const VALID_TOOLS = new Set(["claude", "cursor", "codex", "ccc", "dsh"]);
 function jsonReply(res, status, data) {
     res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
     res.end(JSON.stringify(data));
@@ -38,7 +39,7 @@ function validateTool(rawTool) {
 function validateCwd(rawCwd) {
     const cwd = stringValue(rawCwd);
     if (!cwd)
-        throw new Error("cwd must be a non-empty string");
+        return homedir();
     return resolve(cwd);
 }
 export async function handleAgentDelegateTaskRequest(req, res, platform) {
@@ -70,8 +71,6 @@ export async function handleAgentDelegateTaskRequest(req, res, platform) {
         tool = validateTool(payload.tool);
         cwd = validateCwd(payload.cwd);
         const rawPrompt = promptFromPayload(payload);
-        if (!rawPrompt)
-            throw new Error("prompt must be a non-empty string");
         const sharedPrefix = applySharedPrefix(rawPrompt);
         promptText = sharedPrefix.text;
         promptNamePrefix = sharedPrefix.body || rawPrompt;
@@ -117,24 +116,27 @@ export async function handleAgentDelegateTaskRequest(req, res, platform) {
 }
 export function buildAgentDelegateTaskCapabilityPrompt(input) {
     const lines = [
-        "[ChatCCC local capability: delegate task]",
-        "You can create a separate Feishu ChatCCC agent session and assign its first task by calling this local endpoint.",
+        "[ChatCCC local capability: new session]",
+        "You can create a separate Feishu ChatCCC agent session (a new group) and optionally assign its first task by calling this local endpoint.",
         "",
         `POST ${input.url}`,
         "Content-Type: application/json; charset=utf-8",
         "",
-        'Body: {"tool":"codex|claude|cursor","cwd":"absolute working directory","open_id":"Feishu open_id to invite","prompt":"first task text"}',
+        'Body: {"tool":"claude|cursor|codex|ccc|dsh","cwd":"absolute working directory","open_id":"initiator open_id","prompt":"optional first task"}',
         "",
         "Rules:",
-        "- Use this only when the user asks you to start a separate delegated conversation/session.",
-        "- Pass cwd explicitly as an absolute local path.",
-        "- Pass tool explicitly when the user specified a target agent.",
-        "- Use open_id for one user or open_ids/openIds for multiple users.",
+        "- Use this when the user asks to start a new conversation/session, optionally in a specific directory.",
+        "- Pass open_id exactly as provided to you; the new group will only include that requester.",
+        "- Pass cwd as an absolute local path. When the user does not name a directory, use your current working directory.",
+        "- tool is optional; omit it to use the default agent, or pass one of claude/cursor/codex/ccc/dsh when the user names a tool.",
+        "- prompt is optional; omit it to just create the session without sending a first task.",
         "- The prompt is sent through the normal ChatCCC prompt path, so project prompt injection and IM skills still apply.",
         "- Request body must be UTF-8 encoded JSON bytes. Do not call Feishu Open Platform directly.",
-        "[/ChatCCC local capability: delegate task]",
+        "[/ChatCCC local capability: new session]",
     ];
     if (input.cwd)
         lines.splice(2, 0, `Current working directory: ${input.cwd}`);
+    if (input.openId)
+        lines.splice(2, 0, `Initiator open_id: ${input.openId}`);
     return lines.join("\n");
 }

package/dist/src/agent-delegate-task.js

@@ -7,9 +7,10 @@ import { sessionChatName } from "./session-name.js";
 export async function delegateAgentTask(input) {
     const cwd = resolve(input.cwd);
     const toolLabel = toolDisplayName(input.tool);
+    const hasPrompt = input.promptText.trim().length > 0;
     const init = await initClaudeSession(input.tool, cwd);
     const sessionId = init.sessionId;
-    const chatNamePrefix = input.chatNamePrefix?.trim() || input.promptText.slice(0, 10) || "新会话";
+    const chatNamePrefix = input.chatNamePrefix?.trim() || (hasPrompt ? input.promptText.slice(0, 10) : "新会话");
     const chatName = sessionChatName(chatNamePrefix, cwd);
     let chatId;
     try {
@@ -36,13 +37,17 @@ export async function delegateAgentTask(input) {
     await input.platform.sendCard(chatId, `${toolLabel} Session Ready`, `已创建 **${toolLabel}** 会话群。\n\n` +
         `**Session ID:** ${sessionId}\n` +
         `**工作目录:** \`${cwd}\`\n\n` +
-        `下面会自动把任务作为第一句话发送给 ${toolLabel}。`, "green").catch(() => { });
+        (hasPrompt
+            ? `下面会自动把任务作为第一句话发送给 ${toolLabel}。`
+            : `直接在这里发消息即可与 ${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);
+    if (hasPrompt) {
+        await resumeAndPrompt(sessionId, input.promptText, input.platform, chatId, input.msgTimestamp ?? Date.now(), input.tool, input.traceId, input.openIds?.[0]);
+    }
     console.log(`[${ts()}] [AGENT-DELEGATE-TASK] created ${toolLabel} session=${sessionId} chat=${chatId} cwd=${cwd}`);
     return { chatId, sessionId, tool: input.tool, cwd };
 }

package/dist/src/agent-set-cwd-rpc.js

@@ -0,0 +1,73 @@
+import { resolve } from "node:path";
+import { stat } from "node:fs/promises";
+import { addRecentDir, setDefaultCwd } from "./config.js";
+import { readUtf8JsonBody } from "./agent-rpc-body.js";
+import { getChatsForSession } from "./session-chat-binding.js";
+export const AGENT_SET_CWD_PATH = "/api/agent/set-cwd";
+const MAX_REQUEST_BYTES = 64 * 1024;
+function jsonReply(res, status, data) {
+    res.writeHead(status, { "Content-Type": "application/json; charset=utf-8" });
+    res.end(JSON.stringify(data));
+}
+function stringValue(value) {
+    return typeof value === "string" ? value.trim() : "";
+}
+/**
+ * Agent 本地能力：设置后续新建会话的默认工作目录（等价于 /cd，不改变当前会话）。
+ * 请求携带发起者当前 session_id，主进程据此反查 chatId，并持久化到该 chat 的
+ * working_dir 文件，同时写入最近目录记录。
+ */
+export async function handleAgentSetCwdRequest(req, res) {
+    const url = new URL(req.url ?? "/", "http://127.0.0.1");
+    if (url.pathname !== AGENT_SET_CWD_PATH)
+        return false;
+    if (req.method !== "POST") {
+        jsonReply(res, 405, { ok: false, error: "Method not allowed" });
+        return true;
+    }
+    let payload;
+    try {
+        payload = await readUtf8JsonBody(req, MAX_REQUEST_BYTES);
+    }
+    catch (err) {
+        jsonReply(res, 400, { ok: false, error: err.message || "Invalid JSON" });
+        return true;
+    }
+    const sessionId = stringValue(payload.session_id);
+    if (!sessionId) {
+        jsonReply(res, 400, { ok: false, error: "Missing session_id" });
+        return true;
+    }
+    const rawDir = stringValue(payload.dir) || stringValue(payload.path);
+    if (!rawDir) {
+        jsonReply(res, 400, { ok: false, error: "dir must be a non-empty string" });
+        return true;
+    }
+    const dir = resolve(rawDir);
+    try {
+        const st = await stat(dir);
+        if (!st.isDirectory()) {
+            jsonReply(res, 400, { ok: false, error: `path is not a directory: ${dir}` });
+            return true;
+        }
+    }
+    catch {
+        jsonReply(res, 400, { ok: false, error: `directory does not exist: ${dir}` });
+        return true;
+    }
+    const chatIds = getChatsForSession(sessionId);
+    const chatId = chatIds[0];
+    if (!chatId) {
+        jsonReply(res, 404, { ok: false, error: "No chat bound to this session; cannot set working directory." });
+        return true;
+    }
+    try {
+        await setDefaultCwd(dir, chatId);
+        await addRecentDir(dir);
+        jsonReply(res, 200, { ok: true, dir, chat_id: chatId });
+    }
+    catch (err) {
+        jsonReply(res, 500, { ok: false, error: err.message });
+    }
+    return true;
+}

package/dist/src/cards.js

@@ -143,10 +143,7 @@ export function buildHelpCard(userText, opts = {}) {
         "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
         "发送 **/usage** 查看当前 Agent 的用量或余额",
         "发送 **/restart** 重启 ChatCCC 进程",
-        "发送 **/restart safe** 等待现有任务完成后安全重启",
         "发送 **/update** 更新并重启（仅 npm 全局安装可用）",
-        "发送 **/update safe** 等待现有任务完成后安全更新",
-        "发送 **/safestatus** 查看安全维护状态，**/cancelsf** 取消等待中的预约",
         ABD_HELP_LINE,
     ].join("\n");
     return JSON.stringify({

package/dist/src/im-skills.js

@@ -56,8 +56,8 @@ function promptCacheKey(input) {
     const names = input.enabledSkillNames
         ? [...input.enabledSkillNames].sort().join(",")
         : "*";
-    const { session_id, cwd } = input.variables;
-    return `${input.skillsDir ?? DEFAULT_IM_SKILLS_DIR}|${names}|${session_id}|${cwd}`;
+    const { session_id, cwd, open_id } = input.variables;
+    return `${input.skillsDir ?? DEFAULT_IM_SKILLS_DIR}|${names}|${session_id}|${cwd}|${open_id}`;
 }
 /** 带会话级缓存的 buildImSkillsPrompt。同 session + 同 cwd 时直接返回缓存的渲染结果。 */
 export async function buildImSkillsPromptCached(input) {

package/dist/src/index.js

@@ -40,6 +40,7 @@ import { handleAgentFileRequest } from "./agent-file-rpc.js";
 import { handleAgentDelegateTaskRequest } from "./agent-delegate-task-rpc.js";
 import { handleAgentStopStuckRequest } from "./agent-stop-stuck.js";
 import { handleAgentReloadConfigRequest } from "./agent-reload-config-rpc.js";
+import { handleAgentSetCwdRequest } from "./agent-set-cwd-rpc.js";
 import { handleChatGptSubscriptionRequest } from "./chatgpt-subscription-rpc.js";
 import { applyPrivacy } from "./privacy.js";
 import { createCardKitCard, sendCardKitMessage, updateCardKitCard, } from "./cardkit.js";
@@ -561,6 +562,7 @@ async function main() {
             if (injected)
                 return true;
             return (await handleAgentReloadConfigRequest(req, res))
+                || (await handleAgentSetCwdRequest(req, res))
                 || (await handleAgentImageRequest(req, res))
                 || (await handleAgentFileRequest(req, res))
                 || (await handleAgentDelegateTaskRequest(req, res, feishuPlatform))
@@ -622,6 +624,7 @@ async function main() {
     });
     setExtraApiHandler(async (req, res) => {
         return (await handleAgentReloadConfigRequest(req, res))
+            || (await handleAgentSetCwdRequest(req, res))
             || (await handleAgentImageRequest(req, res))
             || (await handleAgentFileRequest(req, res))
             || (await handleAgentDelegateTaskRequest(req, res, feishuPlatform))

package/dist/src/orchestrator.js

@@ -2090,7 +2090,7 @@ async function handleCommandInternal(platform, text, chatId, openId, msgTimestam
         }
         try {
             logTrace(tid, "RESUME", { sessionId, tool: descriptionTool });
-            const resumeOutcome = await resumeAndPrompt(sessionId, promptText, platform, chatId, msgTimestamp, descriptionTool, tid);
+            const resumeOutcome = await resumeAndPrompt(sessionId, promptText, platform, chatId, msgTimestamp, descriptionTool, tid, openId);
             if (resumeOutcome === "error") {
                 logTrace(tid, "DONE", { outcome: "resume_error", sessionId });
                 console.error(`[${ts()}] [RESUME] Session ${sessionId} ended with an Agent error`);
@@ -2269,7 +2269,7 @@ async function handleCommandInternal(platform, text, chatId, openId, msgTimestam
             if (!switchResult.ok) {
                 throw switchResult.error ?? new Error("Failed to bind Feishu private session");
             }
-            await resumeAndPrompt(sessionId, promptText, platform, chatId, msgTimestamp, tool, tid);
+            await resumeAndPrompt(sessionId, promptText, platform, chatId, msgTimestamp, tool, tid, openId);
             logTrace(tid, "DONE", {
                 outcome: "auto_new_feishu_p2p_prompt_done",
                 chatId,

package/dist/src/session.js

@@ -913,8 +913,10 @@ export async function initClaudeSession(tool, overrideCwd, chatId) {
     await addRecentDir(cwd);
     return { sessionId, cwd };
 }
-export async function resumeAndPrompt(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId) {
-    return runAgentSession(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId);
+export async function resumeAndPrompt(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId, initiatorOpenId) {
+    return runAgentSession(sessionId, userText, platform, chatId, msgTimestamp, tool, traceId, {
+        initiatorOpenId,
+    });
 }
 export async function runAgentSession(sessionId, userText, platform, _chatId, msgTimestamp, tool, traceId, options = {}) {
     const tid = traceId ?? "";
@@ -990,8 +992,10 @@ export async function runAgentSession(sessionId, userText, platform, _chatId, ms
         const skillVariables = {
             cwd,
             session_id: sessionId,
+            open_id: options.initiatorOpenId,
             im_skills_cache_dir: imSkillsCacheDir,
             delegate_task_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/delegate-task`,
+            set_cwd_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/set-cwd`,
             send_image_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/send-image`,
             send_file_url: `http://127.0.0.1:${CHATCCC_PORT}/api/agent/send-file`,
             send_image_script: join(feishuSkillDir, "send-image.mjs"),

package/im-skills/feishu-skill/skill.md

@@ -1,12 +1,26 @@
----
-name: feishu-skill
-description: Feishu IM local skills for sending and receiving images, files, and videos.
----
-
-Current working directory: {{cwd}}
-
-Use local endpoints instead of calling Feishu Open Platform directly.
-
+---
+name: feishu-skill
+description: Feishu IM local skills for sending images, files, videos, and for creating new sessions or switching working directories.
+---
+
+Current working directory: {{cwd}}
+Your session id: {{session_id}}
+Your Feishu open_id: {{open_id}}
+
+Use local endpoints instead of calling Feishu Open Platform directly.
+
 - **Send images**: POST `{{send_image_url}}` with `{"session_id":"{{session_id}}","path":"<absolute path>","caption":"<optional>"}` — read `{{im_skills_cache_dir}}/feishu-skill/receive-send-image.md`
 - **Send files/videos**: POST `{{send_file_url}}` with `{"session_id":"{{session_id}}","path":"<absolute path>","caption":"<optional>"}` — read `{{im_skills_cache_dir}}/feishu-skill/receive-send-file.md`
-- **Delegate a task to a new agent conversation**: POST `{{delegate_task_url}}` with `{"tool":"codex|claude|cursor","cwd":"<absolute working directory>","open_id":"<Feishu user open_id>","prompt":"<first task>"}`. Use `open_ids` for multiple users. This uses the normal ChatCCC prompt flow, so project prompt injection and IM skills still apply.
+- **Create a new session (新建会话)**: POST `{{delegate_task_url}}` with `{"tool":"claude|cursor|codex|ccc|dsh","cwd":"<absolute path>","open_id":"{{open_id}}","prompt":"<optional first task>"}`. This creates a new Feishu group and session, and only adds you (the requester). `tool` and `prompt` are optional; omit `prompt` to just create the session without a first task.
+- **Set default working directory (cd / 切换目录)**: POST `{{set_cwd_url}}` with `{"session_id":"{{session_id}}","dir":"<absolute path>"}`. This sets the default directory for future new sessions only; it does not change the current session.
+
+How to map user requests to these endpoints:
+
+- "新建会话 / 开个新会话 / 换个新会话" → create a new session (no prompt). Use `cwd` = your current working directory ({{cwd}}) unless the user names a directory.
+- "在 <目录> 新建会话（做 <任务>）" → create a new session with `cwd` = that directory, and set `prompt` to the task if one was given.
+- "cd 到 <目录> / 切换到 <目录> / 去 <目录> 干活" → judge intent:
+  - if the user wants to start working there now (a fresh conversation in that directory) → create a new session with `cwd` = that directory.
+  - if the user only wants to change the default directory for future sessions → call set-cwd.
+  - when ambiguous, prefer creating a new session (the more common intent for "切换到").
+- Directory names may be fuzzy or relative; resolve them to an absolute local path (using your file tools) before calling either endpoint.
+- `open_id` must always be passed as exactly {{open_id}}; do not invent it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.268",
+  "version": "0.2.270",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",