@mokuyoaxis/dsh-iris 0.1.1 → 0.1.3

package/lib/api.js

@@ -12,12 +12,21 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
+import crypto from 'node:crypto';
 import { irisHome, capabilitiesOf, onChange as onConfigChange } from './config.js';
 import { mimeOf, mediaUrl } from './media.js';
 import * as tasks from './tasks.js';
 import { runAction } from './actions.js';
 import { chmodPrivateFile, ensurePrivateDir } from './private-storage.js';
 import { inferMediaProtocol } from './provider-protocol.js';
+import { deriveUserState } from './task-semantics.js';
+import { optimizePrompt } from './prompt-optimizer.js';
+import {
+  importPromptOptimizerConfig,
+  loadPromptOptimizerConfig,
+  resetPromptOptimizerConfig,
+  setPromptOptimizerEnabled
+} from './prompt-optimizer-config.js';
 
 function readJsonSafe(file) {
   try {
@@ -68,6 +77,21 @@ function mediaOf(task) {
     }));
 }
 
+const V2_FACT_FIELDS = ['phase', 'acceptance', 'watchState', 'outcome', 'deliveryState', 'cancelState'];
+
+function isTaskV2(t) {
+  return Boolean(t && t.schemaVersion === 2 && V2_FACT_FIELDS.every((field) => Object.prototype.hasOwnProperty.call(t, field)));
+}
+
+/** 旧记录保持原四态；只有完整 v2 记录才使用事实轴派生用户态。 */
+function taskUserState(t) {
+  if (isTaskV2(t)) return deriveUserState(t);
+  if (t && t.status === 'succeeded') return 'succeeded';
+  if (t && t.status === 'failed') return 'failed';
+  if (t && t.status === 'canceled') return 'canceled';
+  return 'running';
+}
+
 function taskPublic(t) {
   const elapsedMs =
     t.elapsedMs ||
@@ -76,6 +100,9 @@ function taskPublic(t) {
     id: t.id,
     cap: t.cap || '',
     status: t.status || 'running',
+    userState: taskUserState(t),
+    schemaVersion: Number(t.schemaVersion || 1),
+    revision: Number(t.revision || 0),
     progress: t.progress || '',
     model: t.model || '',
     providerName: t.providerName || '',
@@ -87,6 +114,8 @@ function taskPublic(t) {
     saved: !!t.saved,
     expired: !!t.expired,
     mode: t.mode || '',
+    retryOf: t.retryOf || '',
+    attentionDisposition: tasks.attentionDisposition(t),
     files: Array.isArray(t.files) ? t.files.map((f) => path.basename(f)) : [],
     media: mediaOf(t)
   };
@@ -103,21 +132,32 @@ function loadProviders() {
   return Array.isArray(cache && cache.providers) ? cache.providers : [];
 }
 
-/** 构建完整工作台状态（纯 JSON，可序列化） */
+const STATE_EPOCH = crypto.randomUUID();
+let stateRevision = 0;
+
+/** 构建完整工作台状态（纯 JSON，可序列化）；序号用于客户端拒绝迟到快照。 */
 export function buildState() {
-  const tasks = loadTasks();
+  const taskRecords = loadTasks();
   const providers = loadProviders();
 
-  const all = [...tasks].sort((a, b) => String(b.createdAt || '').localeCompare(String(a.createdAt || '')));
-  const running = all.filter((t) => t.status === 'running' && !t.expired);
-  const terminal = all.filter((t) => t.status !== 'running');
+  const all = [...taskRecords].sort((a, b) => String(b.createdAt || '').localeCompare(String(a.createdAt || '')));
+  const stateOf = (t) => taskUserState(t);
+  const needsAttention = (t) => ['watching_paused', 'needs_attention', 'artifact_unavailable'].includes(stateOf(t));
+  const acknowledged = (t) => tasks.attentionDisposition(t).status === 'acknowledged';
+  const running = all.filter((t) => ['queued', 'running'].includes(stateOf(t)) && !t.expired);
+  const attention = all.filter((t) => needsAttention(t) && !acknowledged(t) && !t.expired);
+  const terminal = all.filter((t) => ['succeeded', 'failed', 'canceled'].includes(stateOf(t))
+    || (needsAttention(t) && acknowledged(t)) || t.expired);
   const recent = terminal.slice(0, 100).map(taskPublic);
 
   return {
+    stateEpoch: STATE_EPOCH,
+    stateRevision: ++stateRevision,
     providers: providers.map(providerPublic),
     tasks: {
       recent,
       recentTotal: terminal.length, // 泡泡「查看全部 (N)」计数用（不受 slice 截断）
+      attention: attention.slice(0, 20).map(taskPublic),
       running: running.slice(0, 10).map(taskPublic)
     }
   };
@@ -131,15 +171,44 @@ export function sseClientCount() {
 }
 
 const sseClients = new Set(); // 活跃 res（长连接）
+const sseBlocked = new Set(); // 背压中的连接
+const sseLatest = new WeakMap(); // 每个慢连接只保留最新状态
+const sseDrainBound = new WeakSet();
 let sseHeartbeat = null;      // 心跳定时器（15s，防代理/浏览器空闲断连）
 let sseThrottleTimer = null;  // 推送节流（400ms 合并，防盯守高频 update 刷屏）
 let ssePending = false;
 let sseBound = false;
 
+function bindSseDrain(res) {
+  sseBlocked.add(res);
+  if (sseDrainBound.has(res)) return;
+  sseDrainBound.add(res);
+  res.once('drain', () => {
+    sseDrainBound.delete(res);
+    sseBlocked.delete(res);
+    const latest = sseLatest.get(res);
+    sseLatest.delete(res);
+    if (latest !== undefined) pushSse(res, latest);
+  });
+}
+
 function pushSse(res, data) {
   if (!res || res.writableEnded || res.destroyed) return;
+  if (sseBlocked.has(res)) {
+    sseLatest.set(res, data);
+    return;
+  }
+  try {
+    if (res.write(`data: ${data}\n\n`) === false) bindSseDrain(res);
+  } catch (_) {
+    /* 连接已死，close 事件会清理 */
+  }
+}
+
+function pushSseComment(res, comment) {
+  if (!res || res.writableEnded || res.destroyed || sseBlocked.has(res)) return;
   try {
-    res.write(`data: ${data}\n\n`);
+    if (res.write(`: ${comment}\n\n`) === false) bindSseDrain(res);
   } catch (_) {
     /* 连接已死，close 事件会清理 */
   }
@@ -170,7 +239,7 @@ function scheduleBroadcast() {
 function ensureHeartbeat() {
   if (sseHeartbeat) return;
   sseHeartbeat = setInterval(() => {
-    for (const res of [...sseClients]) pushSse(res, ': ping'); // 注释行保持连接活跃
+    for (const res of [...sseClients]) pushSseComment(res, 'ping'); // 注释帧不覆盖背压期间的最新状态
     if (!sseClients.size) stopHeartbeat();
   }, 15000);
   if (sseHeartbeat && sseHeartbeat.unref) sseHeartbeat.unref();
@@ -232,6 +301,8 @@ function serveSse(res) {
   pushSse(res, JSON.stringify(buildState())); // 立即推当前状态
   const onClose = () => {
     sseClients.delete(res);
+    sseBlocked.delete(res);
+    sseLatest.delete(res);
     if (!sseClients.size) {
       stopHeartbeat();
       if (sseThrottleTimer) clearTimeout(sseThrottleTimer);
@@ -244,7 +315,7 @@ function serveSse(res) {
   res.on('error', onClose);
 }
 
-/** webServer 前缀路由 handler：GET/HEAD /iris/api/state 和 /iris/api/task/:id，POST /iris/api/actions/:name */
+/** webServer 前缀路由 handler：状态、任务、动作与提示词优化器 API。 */
 export function serveApi(req, res, ctx) {
   try {
     const method = String(req.method || 'GET').toUpperCase();
@@ -256,6 +327,8 @@ export function serveApi(req, res, ctx) {
       if (urlPath === '/iris/api/upload') {
         return handleUpload(req, res);
       }
+      const promptMatch = typeof ctx === 'object' && urlPath.match(/^\/iris\/api\/prompt-optimizer\/(optimize|import|reset|enabled)\/?$/);
+      if (promptMatch) return handlePromptOptimizer(ctx, promptMatch[1], req, res);
       const actionMatch = typeof ctx === 'object' && urlPath.match(/^\/iris\/api\/actions\/([A-Za-z0-9_-]+)\/?$/);
       if (!actionMatch) { return sendJson(res, 405, { error: 'method not allowed' }); }
       return handleAction(ctx, actionMatch[1], req, res);
@@ -269,6 +342,9 @@ export function serveApi(req, res, ctx) {
       if (method === 'HEAD') return sendJson(res, 405, { error: 'method not allowed' });
       return serveSse(res);
     }
+    if (urlPath === '/iris/api/prompt-optimizer/config') {
+      return sendJson(res, 200, method === 'HEAD' ? {} : loadPromptOptimizerConfig());
+    }
     const taskMatch = urlPath.match(/^\/iris\/api\/task\/([^/]+)$/);
     if (taskMatch) {
       return serveTaskDetail(taskMatch[1], method, res);
@@ -297,10 +373,12 @@ function sendJson(res, status, obj) {
 
 /** POST /iris/api/actions/:name：读取 JSON body 调 runAction 返回结果 */
 const MAX_BODY_BYTES = 1e6; // 1MB 上限（防滥用）
-function handleAction(ctx, name, req, res) {
+function handleJsonPost(req, res, execute) {
   const chunks = [];
   const controller = new AbortController();
   let completed = false;
+  let totalBytes = 0;
+  let overflow = false;
   const finish = (status, body) => {
     if (completed) return;
     completed = true;
@@ -309,32 +387,49 @@ function handleAction(ctx, name, req, res) {
   const disconnect = () => { if (!completed) controller.abort(); };
   if (typeof req.on === 'function') req.on('aborted', disconnect);
   if (typeof res.on === 'function') res.on('close', disconnect);
-  let totalBytes = 0; // 注意：必须按字节计——body 数组的 length 是块数不是字节数（旧代码的坑）
-  let overflow = false;
-  req.on('data', (c) => {
+  req.on('data', (chunk) => {
     if (overflow) return;
-    totalBytes += c.length;
+    totalBytes += chunk.length;
     if (totalBytes > MAX_BODY_BYTES) {
       overflow = true;
-      chunks.length = 0; // 丢弃已收块，不再占内存
+      chunks.length = 0;
       return;
     }
-    chunks.push(c);
+    chunks.push(chunk);
   });
   req.on('end', async () => {
     if (overflow) return finish(413, { error: 'request body too large (limit 1MB)' });
     try {
       const raw = Buffer.concat(chunks).toString('utf8');
-      const args = raw ? JSON.parse(raw) : {};
-      const result = await runAction(ctx, name, args, { signal: controller.signal });
+      const body = raw ? JSON.parse(raw) : {};
+      const result = await execute(body, controller.signal);
       finish(200, result);
     } catch (err) {
-      finish(controller.signal.aborted ? 499 : 400, { error: controller.signal.aborted ? 'request canceled' : String((err && err.message) || err) });
+      finish(controller.signal.aborted ? 499 : 400, {
+        error: controller.signal.aborted ? 'request canceled' : String((err && err.message) || err)
+      });
     }
   });
   req.on('error', () => finish(400, { error: 'bad request' }));
 }
 
+function handleAction(ctx, name, req, res) {
+  return handleJsonPost(req, res, (args, signal) => runAction(ctx, name, args, { signal }));
+}
+
+function handlePromptOptimizer(ctx, operation, req, res) {
+  return handleJsonPost(req, res, async (body, signal) => {
+    if (operation === 'optimize') return optimizePrompt(ctx, body, { signal });
+    if (operation === 'import') {
+      const imported = body && body.config !== undefined ? body.config : body;
+      return { ok: true, ...importPromptOptimizerConfig(imported) };
+    }
+    if (operation === 'reset') return { ok: true, ...resetPromptOptimizerConfig() };
+    if (operation === 'enabled') return { ok: true, ...setPromptOptimizerEnabled(body && body.enabled) };
+    throw new Error('unknown prompt optimizer operation');
+  });
+}
+
 /* ---------- 文件选择器 L2：本地文件上传（阶段 10） ---------- */
 export const MAX_UPLOAD_BYTES = 64 * 1024 * 1024;
 export const UPLOAD_TTL_MS = 7 * 24 * 60 * 60 * 1000;
@@ -462,6 +557,10 @@ function serveTaskDetail(taskId, method, res) {
     id: t.id,
     cap: t.cap || '',
     status: t.status || '',
+    userState: taskUserState(t),
+    schemaVersion: Number(t.schemaVersion || 1),
+    revision: Number(t.revision || 0),
+    ...(isTaskV2(t) ? Object.fromEntries(V2_FACT_FIELDS.map((field) => [field, t[field]])) : {}),
     progress: t.progress || '',
     model: t.model || '',
     providerName: t.providerName || '',
@@ -472,6 +571,11 @@ function serveTaskDetail(taskId, method, res) {
     error: t.error || '',
     mode: t.mode || '',
     remoteTaskId: t.remoteTaskId || '',
+    retryOf: t.retryOf || '',
+    manualRetries: Array.isArray(t.manualRetries) ? t.manualRetries.filter((item) => item && item.taskId).map((item) => ({
+      taskId: String(item.taskId), createdAt: item.createdAt || ''
+    })) : [],
+    attentionDisposition: tasks.attentionDisposition(t),
     files: Array.isArray(t.files) ? t.files.map((f) => path.basename(f)) : [],
     media: mediaOf(t),
     attachments: Array.isArray(t.attachments) ? t.attachments.map((a) => ({

package/lib/bundled-skills.js

@@ -0,0 +1,62 @@
+'use strict';
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const SKILL_NAMES = ['iris-verify-ui', 'iris-compose-media'];
+const SKILL_ROOT = fileURLToPath(new URL('../.dsh/skills/', import.meta.url));
+
+function parseScalar(value, file) {
+  const trimmed = value.trim();
+  if (trimmed.startsWith('"')) {
+    try {
+      return JSON.parse(trimmed);
+    } catch (error) {
+      throw new Error(`随包 Skill frontmatter 字符串无效：${file}: ${error.message}`);
+    }
+  }
+  if (trimmed.startsWith("'") && trimmed.endsWith("'")) {
+    return trimmed.slice(1, -1).replaceAll("''", "'");
+  }
+  return trimmed;
+}
+
+/** 读取由 Iris 自己发布的固定 Skill；不把此解析器当作通用 YAML 解析器。 */
+export function loadBundledSkills() {
+  return SKILL_NAMES.map((expectedName) => {
+    const directory = path.join(SKILL_ROOT, expectedName);
+    const file = path.join(directory, 'SKILL.md');
+    const source = fs.readFileSync(file, 'utf8');
+    const frontmatter = source.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?/);
+    if (!frontmatter) throw new Error(`随包 Skill 缺少 frontmatter：${file}`);
+
+    const nameLine = frontmatter[1].match(/^name:\s*(.+)$/m);
+    const descriptionLine = frontmatter[1].match(/^description:\s*(.+)$/m);
+    const name = nameLine ? parseScalar(nameLine[1], file) : '';
+    const description = descriptionLine ? parseScalar(descriptionLine[1], file) : '';
+    if (name !== expectedName) throw new Error(`随包 Skill 名称不匹配：${file}`);
+    if (!description) throw new Error(`随包 Skill 缺少 description：${file}`);
+
+    return Object.freeze({
+      name,
+      description,
+      content: source.slice(frontmatter[0].length).replace(/^\r?\n/, ''),
+      source: 'bundled',
+      provider: 'iris-bundled',
+      path: file,
+      resourceBase: Object.freeze({ kind: 'directory', path: directory })
+    });
+  });
+}
+
+/** 注册为宿主级 runtime Skill；DSH 项目目录中的同名 Skill 仍按原生优先级胜出。 */
+export function registerBundledSkills(ctx) {
+  const registry = ctx && (ctx.skills || (typeof ctx.get === 'function' && ctx.get('skills')));
+  if (!registry || typeof registry.register !== 'function') {
+    throw new Error('DSH Skill registry 不可用');
+  }
+  const skills = loadBundledSkills();
+  for (const skill of skills) registry.register(skill);
+  return skills.map((skill) => skill.name);
+}