@yachiyo-5i/xlyra-agent 1.2.0 → 1.3.1

package/README.md

@@ -215,7 +215,7 @@ Runtime data is stored under `~/.xlyra-agent/`:
 | `POST` | `/sessions` | Start a session or continue an existing session |
 | `GET` | `/sessions` | List recent sessions with pagination |
 | `GET` | `/sessions/:id/transcript` | Read the complete transcript and compaction records |
-| `PATCH` | `/sessions/:id` | Rename a session |
+| `PATCH` | `/sessions/:id` | Rename, or archive/restore (`{archived: true\|false}`; archived = read-only until restored) |
 | `DELETE` | `/sessions/:id` | Delete an idle session |
 | `POST` | `/sessions/:id/retry` | Retry from a selected user message |
 | `POST` | `/sessions/:id/compact-context` | Compact the current model context manually |

package/dist/{chunk-LQRXFYA3.js → chunk-BOTYL4W5.js}

@@ -74,11 +74,14 @@ var StaticCredentialProvider = class {
 };
 var DEFAULT_RENEW_THRESHOLD_MS = 5 * 6e4;
 var FALLBACK_TOKEN_TTL_MS = 15 * 6e4;
+var INITIAL_ISSUE_ATTEMPTS = 6;
+var INITIAL_ISSUE_RETRY_DELAY_MS = 500;
 var XlyraCallbackCredentialProvider = class {
   constructor(url, opts) {
     this.url = url;
     this.fetchImpl = opts?.fetchImpl ?? fetch;
     this.renewThresholdMs = opts?.renewThresholdMs ?? DEFAULT_RENEW_THRESHOLD_MS;
+    this.sleep = opts?.sleep ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
     this.now = opts?.now ?? Date.now;
   }
   url;
@@ -89,6 +92,7 @@ var XlyraCallbackCredentialProvider = class {
   inflight = /* @__PURE__ */ new Map();
   fetchImpl;
   renewThresholdMs;
+  sleep;
   now;
   /** 更新当前 run 上下文。token 按 runId 隔离，切换 run 不影响其他 run 的 token */
   setRunContext(context) {
@@ -161,23 +165,28 @@ var XlyraCallbackCredentialProvider = class {
     return this.context;
   }
   async doIssueInitial(context) {
-    let res;
-    try {
-      res = await this.fetchImpl(this.url, {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify({
-          agent_instance_id: context.agentInstanceId,
-          session_id: context.sessionId,
-          run_id: context.runId,
-          model: context.model,
-          reason: "initial"
-        })
-      });
-    } catch {
-      return null;
+    for (let attempt = 0; attempt < INITIAL_ISSUE_ATTEMPTS; attempt += 1) {
+      if (attempt > 0) await this.sleep(INITIAL_ISSUE_RETRY_DELAY_MS);
+      let res;
+      try {
+        res = await this.fetchImpl(this.url, {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify({
+            agent_instance_id: context.agentInstanceId,
+            session_id: context.sessionId,
+            run_id: context.runId,
+            model: context.model,
+            reason: "initial"
+          })
+        });
+      } catch {
+        continue;
+      }
+      const cached = await this.storeFromResponse(context.runId, res);
+      if (cached) return cached;
     }
-    return this.storeFromResponse(context.runId, res);
+    return null;
   }
   async doRenew(context, cached) {
     let res;
@@ -3442,6 +3451,8 @@ var appConfigSchema = z13.object({
     enable_agents_md: z13.boolean().optional(),
     /** 是否发现并暴露 Agent Skills（默认 true） */
     enable_skills: z13.boolean().optional(),
+    /** 停用的 skill 名称名单（不删文件，run 时跳过注入；在 enable_skills 之后生效） */
+    disabled_skills: z13.array(z13.string()).optional(),
     /** 额外 skills 根目录（不替换标准路径） */
     skills_dirs: z13.array(z13.string()).optional()
   }).optional()
@@ -3978,7 +3989,11 @@ function loadWorkspaceContext(workdir, opts = {}) {
     const fragment = formatAgentsMdContext(agents);
     if (fragment) fragments.push(fragment);
   }
-  const skills = enableSkills ? discoverSkills(workdir, opts.skills) : { skills: [], warnings: [] };
+  let skills = enableSkills ? discoverSkills(workdir, opts.skills) : { skills: [], warnings: [] };
+  const disabled = new Set(opts.disabledSkills ?? []);
+  if (disabled.size > 0 && skills.skills.length > 0) {
+    skills = { ...skills, skills: skills.skills.filter((skill) => !disabled.has(skill.name)) };
+  }
   warnings.push(...skills.warnings);
   const catalog = formatSkillsCatalog(skills);
   if (catalog) fragments.push(catalog);
@@ -3987,6 +4002,8 @@ function loadWorkspaceContext(workdir, opts = {}) {
 
 // src/server/routes.ts
 import { Hono } from "hono";
+import fs15 from "fs";
+import path16 from "path";
 import { z as z14 } from "zod";
 function ok(data, message = "") {
   return { success: true, code: 0, message, data };
@@ -4043,8 +4060,9 @@ function createAgentRoutes(ctx) {
       await next();
     });
   }
+  const currentWorkspaceOptions = () => ctx.resolveWorkspaceContext?.() ?? ctx.workspaceContext ?? {};
   const refreshWorkspace = () => {
-    const workspace = loadWorkspaceContext(ctx.workdir, ctx.workspaceContext ?? {});
+    const workspace = loadWorkspaceContext(ctx.workdir, currentWorkspaceOptions());
     for (const warning of workspace.warnings) {
       console.warn(`[workspace-context] ${warning}`);
     }
@@ -4278,6 +4296,12 @@ function createAgentRoutes(ctx) {
     if (!esc || esc.type !== "escalation") fail(404, "\u63D0\u6743\u8BF7\u6C42\u4E0D\u5B58\u5728\u6216\u5DF2\u8FC7\u671F");
     if (esc.resolved_path !== resolved_path) fail(400, "\u6388\u6743\u8DEF\u5F84\u4E0E\u63D0\u6743\u8BF7\u6C42\u4E0D\u4E00\u81F4");
     if (esc.granted !== null && esc.granted !== void 0) fail(400, "\u8BE5\u63D0\u6743\u8BF7\u6C42\u5DF2\u5904\u7406\u8FC7");
+    const lastModelEntry = [...entries].reverse().find(
+      (entry) => isMessageEntry(entry) && Boolean(entry.model?.trim())
+    );
+    const model = lastModelEntry && isMessageEntry(lastModelEntry) ? lastModelEntry.model?.trim() ?? "" : "";
+    if (!model) fail(400, "\u65E0\u6CD5\u786E\u5B9A\u4F1A\u8BDD\u4F7F\u7528\u7684\u6A21\u578B\uFF0C\u8BF7\u91CD\u65B0\u53D1\u9001\u6D88\u606F");
+    ctx.resolver.resolve(model);
     ctx.store.resolveEscalation(sessionId, escalation_id, granted);
     if (!granted) {
       const history2 = ctx.store.buildHistoryBeforeEscalation(sessionId, escalation_id);
@@ -4315,7 +4339,7 @@ function createAgentRoutes(ctx) {
       const { runId: runId2 } = await launchUserMessage({
         sessionId,
         content: "",
-        model: "",
+        model,
         history: history2,
         entryCount: entries.length,
         recordUser: false
@@ -4331,12 +4355,11 @@ function createAgentRoutes(ctx) {
       (e) => isMessageEntry(e) && e.message.role === "user"
     );
     if (!lastUser || !isMessageEntry(lastUser)) fail(400, "\u4F1A\u8BDD\u4E2D\u6CA1\u6709\u53EF\u7EED\u8DD1\u7684\u7528\u6237\u6D88\u606F");
-    ctx.resolver.resolve("");
     const history = ctx.store.buildHistoryBeforeEscalation(sessionId, escalation_id);
     const { messageId, runId } = await launchUserMessage({
       sessionId,
       content: "",
-      model: "",
+      model,
       history,
       entryCount: entries.length,
       recordUser: false
@@ -4403,13 +4426,84 @@ data: ${JSON.stringify(payload)}
     await ctx.registry.cancelSession(c.req.param("id"));
     return c.json(ok({}, "\u5DF2\u8BF7\u6C42\u505C\u6B62\u4F1A\u8BDD"));
   });
+  app.get("/skills", (c) => {
+    const opts = currentWorkspaceOptions();
+    const disabled = new Set(opts.disabledSkills ?? []);
+    const discovered = discoverSkills(ctx.workdir, opts.skills ?? {});
+    return c.json(ok({
+      enabled: opts.enableSkills !== false,
+      skills: discovered.skills.map((skill) => ({
+        name: skill.name,
+        description: skill.description,
+        scope: skill.scope,
+        enabled: !disabled.has(skill.name),
+        path: skill.skillFile,
+        ...skill.license ? { license: skill.license } : {}
+      })),
+      warnings: discovered.warnings
+    }));
+  });
+  const SKILL_FILE_VIEW_MAX_BYTES = 256e3;
+  const findSkill = (name) => {
+    const opts = currentWorkspaceOptions();
+    const discovered = discoverSkills(ctx.workdir, opts.skills ?? {});
+    const skill = discovered.skills.find((item) => item.name === name);
+    return skill ? { skill, disabled: new Set(opts.disabledSkills ?? []) } : null;
+  };
+  app.get("/skills/:name", (c) => {
+    const found = findSkill(c.req.param("name"));
+    if (!found) throw new HttpError(404, `skill \u4E0D\u5B58\u5728\uFF1A${c.req.param("name")}`);
+    const { skill, disabled } = found;
+    const loaded = loadSkillContent(skill);
+    return c.json(ok({
+      name: skill.name,
+      description: skill.description,
+      scope: skill.scope,
+      enabled: !disabled.has(skill.name),
+      path: skill.skillFile,
+      ...skill.license ? { license: skill.license } : {},
+      ...skill.metadata ? { metadata: skill.metadata } : {},
+      content: loaded.content,
+      contentTruncated: loaded.contentTruncated,
+      resources: loaded.resources
+    }));
+  });
+  app.get("/skills/:name/file", (c) => {
+    const found = findSkill(c.req.param("name"));
+    if (!found) throw new HttpError(404, `skill \u4E0D\u5B58\u5728\uFF1A${c.req.param("name")}`);
+    const rel = (c.req.query("path") ?? "").trim().replaceAll("\\", "/").replace(/^\/+/, "");
+    if (!rel) throw new HttpError(400, "\u7F3A\u5C11 path \u53C2\u6570");
+    const root = found.skill.root;
+    const target = path16.resolve(root, rel);
+    if (!target.startsWith(root + path16.sep)) {
+      throw new HttpError(400, "\u8DEF\u5F84\u8D8A\u754C\uFF1A\u4EC5\u5141\u8BB8 skill \u76EE\u5F55\u5185\u7684\u6587\u4EF6");
+    }
+    let stat;
+    try {
+      stat = fs15.lstatSync(target);
+    } catch {
+      throw new HttpError(404, `\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A${rel}`);
+    }
+    if (stat.isSymbolicLink() || !stat.isFile()) {
+      throw new HttpError(400, "\u4EC5\u652F\u6301\u8BFB\u53D6\u666E\u901A\u6587\u4EF6");
+    }
+    const truncated = stat.size > SKILL_FILE_VIEW_MAX_BYTES;
+    const data = Buffer.alloc(Math.min(stat.size, SKILL_FILE_VIEW_MAX_BYTES));
+    const fd = fs15.openSync(target, "r");
+    try {
+      fs15.readSync(fd, data, 0, data.length, 0);
+    } finally {
+      fs15.closeSync(fd);
+    }
+    return c.json(ok({ path: rel, content: data.toString("utf-8"), truncated }));
+  });
   app.get("/health", (c) => c.json(ok({ status: "ok" })));
   return app;
 }
 
 // src/server/session-index.ts
-import fs15 from "fs";
-import path16 from "path";
+import fs16 from "fs";
+import path17 from "path";
 var HEARTBEAT_TIMEOUT_MS = 3e4;
 var SessionIndex = class {
   file;
@@ -4421,7 +4515,7 @@ var SessionIndex = class {
   /** 启动时加载；文件不存在/损坏则从空开始（rebuild 会补齐） */
   load() {
     try {
-      const raw = JSON.parse(fs15.readFileSync(this.file, "utf-8"));
+      const raw = JSON.parse(fs16.readFileSync(this.file, "utf-8"));
       for (const meta of raw.sessions ?? []) this.metas.set(meta.session_id, meta);
     } catch {
       this.metas.clear();
@@ -4533,21 +4627,21 @@ var SessionIndex = class {
     this.persist();
   }
   persist() {
-    const dir = path16.dirname(this.file);
-    fs15.mkdirSync(dir, { recursive: true });
+    const dir = path17.dirname(this.file);
+    fs16.mkdirSync(dir, { recursive: true });
     const tmp = `${this.file}.tmp`;
-    fs15.writeFileSync(tmp, JSON.stringify({ sessions: [...this.metas.values()] }, null, 2));
-    fs15.renameSync(tmp, this.file);
+    fs16.writeFileSync(tmp, JSON.stringify({ sessions: [...this.metas.values()] }, null, 2));
+    fs16.renameSync(tmp, this.file);
   }
 };
 
 // src/server/index.ts
-import path17 from "path";
+import path18 from "path";
 import { serve } from "@hono/node-server";
 
 // src/server/config-routes.ts
 import { Hono as Hono2 } from "hono";
-import fs16 from "fs";
+import fs17 from "fs";
 import { z as z15 } from "zod";
 function maskApiKey(key) {
   if (key.includes("${")) return key;
@@ -4607,11 +4701,12 @@ var putPayloadSchema = z15.object({
     enable_command_execution: z15.boolean().optional(),
     enable_agents_md: z15.boolean().optional(),
     enable_skills: z15.boolean().optional(),
+    disabled_skills: z15.array(z15.string()).optional(),
     skills_dirs: z15.array(z15.string()).optional()
   }).optional()
 });
 function loadRawConfig(configPath) {
-  const raw = JSON.parse(fs16.readFileSync(configPath, "utf-8"));
+  const raw = JSON.parse(fs17.readFileSync(configPath, "utf-8"));
   return appConfigSchema.parse(raw);
 }
 function createConfigRoutes(ctx) {
@@ -4697,19 +4792,29 @@ function createConfigRoutes(ctx) {
 
 // src/server/index.ts
 function createAgentServer(config, opts = {}) {
-  const dataDir = path17.resolve(opts.dataDir ?? defaultDataDir());
-  const configPath = opts.configPath ?? path17.join(dataDir, "config.json");
+  const dataDir = path18.resolve(opts.dataDir ?? defaultDataDir());
+  const configPath = opts.configPath ?? path18.join(dataDir, "config.json");
   const resolver = new EndpointResolver(config.endpoints);
-  const store = new AgentSessionStore(path17.join(dataDir, "sessions"));
-  const index = new SessionIndex(path17.join(dataDir, "index.json"));
+  const store = new AgentSessionStore(path18.join(dataDir, "sessions"));
+  const index = new SessionIndex(path18.join(dataDir, "index.json"));
   index.rebuild(store.scanAll());
   const registry = new RunRegistry();
-  const workdir = path17.resolve(config.agent?.workdir ?? path17.join(dataDir, "workspace"));
+  const workdir = path18.resolve(config.agent?.workdir ?? path18.join(dataDir, "workspace"));
   const grants = new EscalationGrants();
-  const workspaceContext = {
-    enableAgentsMd: config.agent?.enable_agents_md !== false,
-    enableSkills: config.agent?.enable_skills !== false,
-    ...config.agent?.skills_dirs?.length ? { skills: { extraDirs: config.agent.skills_dirs } } : {}
+  const buildWorkspaceContext = (agentConfig) => ({
+    enableAgentsMd: agentConfig?.enable_agents_md !== false,
+    enableSkills: agentConfig?.enable_skills !== false,
+    ...agentConfig?.disabled_skills?.length ? { disabledSkills: agentConfig.disabled_skills } : {},
+    ...agentConfig?.skills_dirs?.length ? { skills: { extraDirs: agentConfig.skills_dirs } } : {}
+  });
+  const startupWorkspaceContext = buildWorkspaceContext(config.agent);
+  const resolveWorkspaceContext = () => {
+    try {
+      return buildWorkspaceContext(loadConfig(configPath).agent);
+    } catch (error) {
+      console.warn(`[workspace-context] \u914D\u7F6E\u8BFB\u53D6\u5931\u8D25\uFF0C\u6CBF\u7528\u542F\u52A8\u5FEB\u7167\uFF1A${error instanceof Error ? error.message : error}`);
+      return startupWorkspaceContext;
+    }
   };
   const app = createAgentRoutes({
     resolver,
@@ -4725,7 +4830,8 @@ function createAgentServer(config, opts = {}) {
       ...skills?.length ? { skills } : {}
     }),
     workdir,
-    workspaceContext,
+    workspaceContext: startupWorkspaceContext,
+    resolveWorkspaceContext,
     ...config.agent?.agent_name ? { agentName: config.agent.agent_name } : {},
     ...config.agent?.persona ? { persona: config.agent.persona } : {},
     ...config.agent?.agent_instance_id ? { agentInstanceId: config.agent.agent_instance_id } : {},
@@ -4745,13 +4851,14 @@ function createAgentServer(config, opts = {}) {
   return { app, registry, store, index };
 }
 function serveFromConfig(opts) {
-  const configPath = opts.configPath ?? path17.join(defaultDataDir(), "config.json");
+  const dataDir = opts.dataDir ? path18.resolve(opts.dataDir) : defaultDataDir();
+  const configPath = opts.configPath ?? path18.join(dataDir, "config.json");
   const config = loadConfig(configPath);
-  const { app } = createAgentServer(config, { configPath });
+  const { app } = createAgentServer(config, { configPath, dataDir });
   const port = opts.port ?? config.server?.port ?? 3210;
   const server = serve({ fetch: app.fetch, port }, (info) => {
     console.log(`xlyra-agent \u670D\u52A1\u5DF2\u542F\u52A8\uFF1Ahttp://127.0.0.1:${info.port}`);
-    console.log(`\u6570\u636E\u76EE\u5F55\uFF1A${defaultDataDir()}\uFF08sessions/ \u4F1A\u8BDD\u8F6C\u5F55\uFF0Cworkspace/ \u5DE5\u5177\u5DE5\u4F5C\u533A\uFF09`);
+    console.log(`\u6570\u636E\u76EE\u5F55\uFF1A${dataDir}\uFF08sessions/ \u4F1A\u8BDD\u8F6C\u5F55\uFF0Cworkspace/ \u5DE5\u5177\u5DE5\u4F5C\u533A\uFF09`);
     if (!config.server?.token) {
       console.warn("\u26A0 \u672A\u914D\u7F6E server.token\uFF0C\u63A5\u53E3\u65E0\u9274\u6743\u2014\u2014\u8BF7\u52FF\u66B4\u9732\u5230\u516C\u7F51");
     }
@@ -4869,4 +4976,4 @@ export {
   createAgentServer,
   serveFromConfig
 };
-//# sourceMappingURL=chunk-LQRXFYA3.js.map
+//# sourceMappingURL=chunk-BOTYL4W5.js.map