xitto-kernel 0.9.3 → 0.9.4

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.9.4
+
+- **執行中可中途補充（steering）**：任務跑到一半,使用者可隨時插話調整方向/補需求,不必取消重來。
+  - 排隊注入,**不中斷正在跑的工具**——下一個邊界才生效:
+    - agent 串流中 → 即時排進 agent 的 steeringQueue(turn 邊界 drain)
+    - 回合之間(goal loop 的驗收空檔,agent 已收尾)→ 緩衝到 task,kernel 下一輪用 `drainSteer` 折進指令
+    - 兩路互斥,不重複套用
+  - 後端:`createTaskStore.steer(id,text)` + `POST /v1/tasks/:id/steer`;kernel `runGoal` 新增 `opts.drainSteer` 鉤子
+  - 許願台:進行中顯示補充輸入框(Enter 送出)+「✋ 已收到,會在下一步納入」回饋;輸入內容/游標在每 1.2s 輪詢重繪間保留,不洗掉打到一半的字
+  - 測試 +4(196/196):串流即時路徑、回合間緩衝/drain-once、非進行中擋下、drainSteer 折進指令
+
 ## 0.9.3
 
 - **許願台佈局優化（視覺層次 + 互動細節）**：

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xitto-kernel",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "type": "module",
   "description": "領域無關的 agent 底座（kernel + 可插拔 DomainPack），從 xitto-code 抽象而來",
   "keywords": [

package/src/app/server.js

@@ -139,6 +139,7 @@ export function createTaskStore({ runJob, concurrency = 2, onFinish, maxEvents =
     else if (ev.type === 'text') { p.phase = 'thinking'; t._textbuf = ((t._textbuf || '') + (ev.delta || '')).slice(-400); p.thinking = t._textbuf.replace(/\s+/g, ' ').trim().slice(-150); }
     else if (ev.type === 'round') { p.round = ev.round; if (ev.maxRounds) p.maxRounds = ev.maxRounds; p.thinking = ''; t._textbuf = ''; }
     else if (ev.type === 'phase') p.phase = ev.phase;
+    else if (ev.type === 'steered') { (p.steers ||= []).push(ev.text); if (p.steers.length > 8) p.steers.shift(); } // 使用者中途補充（給 UI 回饋「已收到」）
     else if (ev.type === 'needs_input') p.phase = 'needs-input';
     else if (ev.type === 'answered') p.phase = 'acting';
     else if (ev.type === 'end') p.phase = ev.status;
@@ -160,7 +161,7 @@ export function createTaskStore({ runJob, concurrency = 2, onFinish, maxEvents =
       t.status = 'running'; t.startedAt = new Date().toISOString();
       emit(t, { type: 'status', status: 'running' });
       Promise.resolve()
-        .then(() => runJob(t.spec, (ev) => emit(t, ev), makeAsk(t), (agent) => { t._agent = agent; }))
+        .then(() => runJob(t.spec, (ev) => emit(t, ev), makeAsk(t), (agent) => { t._agent = agent; }, () => { const b = t.steerBuf || []; t.steerBuf = []; return b; }))
         .then((result) => { t.status = 'done'; t.result = result; })
         .catch((e) => { t.status = 'error'; t.error = e.message || String(e); })
         .finally(() => {
@@ -214,6 +215,19 @@ export function createTaskStore({ runJob, concurrency = 2, onFinish, maxEvents =
       resolve(String(text ?? ''));
       return true;
     },
+    // 中途補充（steering）：任務進行中,使用者插話。agent 正在串流 → 即時排進 steeringQueue（下個 turn 邊界生效,不中斷當前工具）；
+    // 回合之間（goal loop 的 checkGoal 空檔,agent 已收尾）→ 緩衝到 task,由 kernel 下一輪 drainSteer 折進指令。兩路互斥,不重複套用。
+    steer(id, text) {
+      const t = tasks.get(id);
+      if (!t || t.status !== 'running') return false;
+      const msg = String(text ?? '').trim();
+      if (!msg) return false;
+      const live = !!(t._agent && t._agent.state && t._agent.state.isStreaming);
+      if (live) { try { t._agent.steer({ role: 'user', content: [{ type: 'text', text: msg }] }); } catch { (t.steerBuf ||= []).push(msg); } }
+      else (t.steerBuf ||= []).push(msg);
+      emit(t, { type: 'steered', text: msg, queued: !live });
+      return true;
+    },
     stats: () => ({ active, queued: queue.length, total: tasks.size }),
   };
 }
@@ -257,7 +271,7 @@ export function createServerApp({ model, getApiKey, token, baseDir = '.xitto-ser
 
   // 共用：跑一輪/一目標，回傳 { sessionId, text, usage, rounds, done }；onEvent 收原始 kernel 事件；
   // ask（可選）= 澄清通道,讓 agent 在背景任務中暫停問使用者。
-  async function runKernel(spec, onEvent, ask, onAgent) {
+  async function runKernel(spec, onEvent, ask, onAgent, drainSteer) {
     const make = PACKS[spec.pack || 'general'];
     if (!make) throw new Error(`未知 pack「${spec.pack}」，可用：${Object.keys(PACKS).join(', ')}`);
     // 持久工作空間（B 模型）：workdir 綁 workspace（非 sessionId）→ 檔案留存 + 五層沉澱跨成品累積。
@@ -272,7 +286,7 @@ export function createServerApp({ model, getApiKey, token, baseDir = '.xitto-ser
     const wrapped = (ev) => { if (ev.type === 'message_end' && ev.message?.usage) { usage.input += ev.message.usage.input || 0; usage.output += ev.message.usage.output || 0; } onEvent?.(ev); };
     if (spec.mode === 'goal') {
       // 結果導向：回傳交付物（做了什麼 + 產出的檔案 + 是否達成），對話只是過程
-      const o = await kernel.runOutcome(spec.goal || spec.input || "", { maxRounds: 8, history: sess.history, onEvent: wrapped, onAgent, onRound: (i) => wrapped({ type: 'round', round: i.round, maxRounds: i.maxRounds }) });
+      const o = await kernel.runOutcome(spec.goal || spec.input || "", { maxRounds: 8, history: sess.history, onEvent: wrapped, onAgent, drainSteer, onRound: (i) => wrapped({ type: 'round', round: i.round, maxRounds: i.maxRounds }) });
       sess.history = o.history || []; sessions.set(sessionId, sess); persistSession(sessionId, sess);
       try { rmSync(join(workdir, 'tmp'), { recursive: true, force: true }); } catch { /* 清過程檔,失敗無妨 */ }
       // 溯源：邏輯位置 workspace 永遠記；實體路徑只在本地模式給（託管不洩漏伺服器路徑）
@@ -295,7 +309,7 @@ export function createServerApp({ model, getApiKey, token, baseDir = '.xitto-ser
   const tasks = createTaskStore({
     concurrency,
     persistDir: join(baseDir, 'tasks'),
-    runJob: (spec, emit, ask, onAgent) => runKernel(spec, (ev) => { const m = mapEvent(ev); if (m) emit(m); }, ask, onAgent),
+    runJob: (spec, emit, ask, onAgent, drainSteer) => runKernel(spec, (ev) => { const m = mapEvent(ev); if (m) emit(m); }, ask, onAgent, drainSteer),
     onFinish: (task) => { log({ task: task.id, pack: task.spec.pack, mode: task.spec.mode || 'turn', status: task.status, ms: task.startedAt ? Date.parse(task.finishedAt) - Date.parse(task.startedAt) : 0 }); fireWebhook(task); },
   });
 
@@ -359,6 +373,19 @@ export function createServerApp({ model, getApiKey, token, baseDir = '.xitto-ser
       return json(res, 200, { ok: true, taskId: mAns[1], status: 'running' });
     }
 
+    // 中途補充（steering）：任務進行中,使用者插話調整方向/補需求。排隊注入,不中斷當前工作,下個邊界生效。
+    const mSteer = path.match(/^\/v1\/tasks\/([^/]+)\/steer$/);
+    if (req.method === 'POST' && mSteer) {
+      const body = await readBody(req);
+      const t = tasks.get(mSteer[1]);
+      if (!t) return json(res, 404, { error: 'task not found' });
+      if (t.status !== 'running') return json(res, 409, { error: '只有進行中的任務可以補充', status: t.status });
+      const ok = tasks.steer(mSteer[1], body.text);
+      if (!ok) return json(res, 400, { error: '補充內容為空或無法送出' });
+      log({ task: mSteer[1], action: 'steer' });
+      return json(res, 200, { ok: true, taskId: mSteer[1] });
+    }
+
     // 中斷任務（取消鈕）：控制權在使用者手上,降低「啟動了控制不了的東西」的焦慮
     const mCancel = path.match(/^\/v1\/tasks\/([^/]+)\/cancel$/);
     if (req.method === 'POST' && mCancel) {
@@ -436,7 +463,7 @@ export function startServer() {
     console.log(`🪄 許願台：http://localhost:${port}/  （瀏覽器打開即用——說出目標、交付成品）`);
     console.log(`xitto-kernel server · model ${model.id} · 沙箱 ${sandbox ? '開' : '關'} · 背景並發 ${concurrency}${local ? ' · 本地模式(顯示檔案位置)' : ''}`);
     console.log(`token: ${token === 'dev-token' ? 'dev-token（請設 XITTO_SERVER_TOKEN）' : '(已設定)'}`);
-    console.log('API：POST /v1/run · /v1/stream · /v1/tasks · /v1/tasks/:id/{answer,cancel}｜GET /v1/tasks[/:id[/events|/file]] · /health');
+    console.log('API：POST /v1/run · /v1/stream · /v1/tasks · /v1/tasks/:id/{answer,steer,cancel}｜GET /v1/tasks[/:id[/events|/file]] · /health');
   });
   return server;
 }

package/src/app/web/index.html

@@ -79,6 +79,10 @@
   .qbox { margin-top:12px; padding:12px; background:#1d1c12; border:1px solid var(--warn); border-radius:10px; }
   .qbox .q { color:var(--warn); margin-bottom:8px; }
   .qbox input { width:100%; background:#0c0e12; color:var(--fg); border:1px solid var(--line); border-radius:8px; padding:9px; font:inherit; }
+  .steerbox { margin-top:12px; padding-top:10px; border-top:1px dashed var(--line); }
+  .steernote { font-size:12.5px; color:var(--ok); margin-bottom:6px; }
+  #steerin { width:100%; background:#0c0e12; color:var(--fg); border:1px solid var(--line); border-radius:8px; padding:9px 11px; font:inherit; outline:none; }
+  #steerin:focus { border-color:var(--accent); }
   h3 { color:var(--dim); font-size:13px; font-weight:600; text-transform:uppercase; letter-spacing:.05em; margin:28px 0 8px; }
   .hist { border:1px solid transparent; border-radius:8px; padding:8px 10px; margin:3px 0; cursor:pointer; }
   .hist:hover { background:#0c0e12; }
@@ -332,6 +336,8 @@ async function poll() {
 }
 
 function renderCurrent(t) {
+  // 保住 steer 輸入框的內容與游標：輪詢每 1.2s 重繪整張卡,別把使用者正打到一半的補充洗掉
+  const ps=(()=>{const el=document.getElementById("steerin");return el?{v:el.value,f:document.activeElement===el,s:el.selectionStart}:null;})();
   const a = t.result?.artifacts, files = a ? [...(a.created||[]).map(f=>[f,"new"]), ...(a.modified||[]).map(f=>[f,"mod"])] : [];
   const p = t.progress||{}, nLog=(p.log||[]).length;
   const logSec = nLog ? `<div class="logtoggle" onclick="toggleLog()">${expandedLog?"▾ 收合過程":"▸ 展開過程（"+nLog+" 步）"}</div>${expandedLog?`<div class="loglist">${logHtml(p)}</div>`:""}` : "";
@@ -344,6 +350,10 @@ function renderCurrent(t) {
     ${logSec}
     ${t.status==="needs-input"?`<div class="qbox"><div class="q">❓ ${esc(t.pending?.question)}</div>
       <input id="ans" placeholder="輸入你的回答，按 Enter 送出"></div>`:""}
+    ${t.status==="running"?`<div class="steerbox">
+      ${(p.steers||[]).slice(-3).map(s=>`<div class="steernote">✋ 已收到補充，會在下一步納入：${esc(s)}</div>`).join("")}
+      <input id="steerin" placeholder="想補充或調整方向？打字按 Enter——會在下一步納入，不中斷目前工作">
+    </div>`:""}
     ${t.status==="done"?`<div class="summary">${esc(t.result?.text||"")}</div>`:""}
     ${t.status==="error"?`<div class="summary">⚠ ${esc(t.error)}</div>`:""}
     ${files.length?`<div class="files">📦 成品：${files.map(([f,k])=>`<span class="file ${k==="mod"?"mod":""}" onclick="viewFile('${t.taskId}','${encodeURIComponent(f)}','${esc(f)}')">${k==="mod"?"~":"+"} ${esc(f)}</span>`).join("")}</div>`:""}
@@ -364,6 +374,17 @@ function renderCurrent(t) {
       poll();
     }};
   }
+  if (t.status==="running") {
+    const si = $("#steerin");
+    if (si) {
+      if (ps) { si.value = ps.v; if (ps.f) { si.focus(); try { si.setSelectionRange(ps.s, ps.s); } catch {} } }  // 還原打到一半的內容/游標
+      si.onkeydown = async (e) => { if (e.key==="Enter" && si.value.trim()) {
+        const txt = si.value.trim(); si.value = ""; si.disabled = true;
+        await api("/v1/tasks/"+t.taskId+"/steer", { method:"POST", body: JSON.stringify({ text: txt }) });
+        si.disabled = false; si.focus();
+      }};
+    }
+  }
 }
 
 // 繼續／調整：送出接續上一個任務對話(sessionId)+ 同工作區的後續任務

package/src/kernel/index.js

@@ -442,6 +442,11 @@ export function createKernel(pack, config = {}) {
       let sameFeedback = 0;
       for (let round = 1; round <= maxRounds; round++) {
         opts.onRound?.({ round, maxRounds });
+        // 使用者中途補充（steering）：把上一輪之間累積的補充折進這一輪指令（回合內的即時補充走 agent.steer）。
+        if (opts.drainSteer) {
+          const extra = opts.drainSteer();
+          if (extra && extra.length) instruction += '\n\n[使用者中途補充，請納入考量並據此調整]\n' + extra.map((s) => `- ${s}`).join('\n');
+        }
         const r = await api.runTurn(instruction, { history, onEvent: opts.onEvent, onAgent: opts.onAgent });
         history = r.messages;
         if (r.aborted) return { done: false, aborted: true, rounds: round, history };