chainlesschain 0.161.6 → 0.161.7

package/src/lib/chat-core.js

@@ -242,26 +242,39 @@ export async function streamAnthropic(
 export async function* chatStream(messages, options) {
   const { provider, model, baseUrl, apiKey, sessionId } = options;
 
-  const tokens = [];
+  // Token queue + waiter promise. onToken (called synchronously by each
+  // streamX impl per delta) pushes onto the queue and wakes the generator
+  // loop, which yields immediately. Pre-v5.0.3.46 this was a buffering
+  // tokens[] array drained only after `await streamX(...)` resolved — so
+  // the "stream" surfaced no progress until the LLM call finished, which
+  // showed up as the chat.intent placeholder card spinning at "意图: 未识别"
+  // for the full LLM duration.
+  const queue = [];
+  let waiter = null;
+  let done = false;
+  let capturedUsage = null;
+
+  const wake = () => {
+    if (!waiter) return;
+    const w = waiter;
+    waiter = null;
+    w();
+  };
   const onToken = (token) => {
-    tokens.push(token);
+    queue.push(token);
+    wake();
   };
-
-  let capturedUsage = null;
   const onUsage = (u) => {
     capturedUsage = u;
   };
 
-  let fullResponse;
-
+  // Validate creds + assemble URL synchronously so missing-key errors
+  // surface immediately to the consumer instead of being deferred until
+  // the first queue drain tick.
+  let providerCall;
   if (provider === "ollama") {
-    fullResponse = await streamOllama(
-      messages,
-      model,
-      baseUrl,
-      onToken,
-      onUsage,
-    );
+    providerCall = () =>
+      streamOllama(messages, model, baseUrl, onToken, onUsage);
   } else if (provider === "anthropic") {
     const providerDef = BUILT_IN_PROVIDERS.anthropic;
     const url =
@@ -276,14 +289,8 @@ export async function* chatStream(messages, options) {
         `API key required for anthropic (set ${providerDef?.apiKeyEnv || "ANTHROPIC_API_KEY"})`,
       );
     }
-    fullResponse = await streamAnthropic(
-      messages,
-      model,
-      url,
-      key,
-      onToken,
-      onUsage,
-    );
+    providerCall = () =>
+      streamAnthropic(messages, model, url, key, onToken, onUsage);
   } else {
     const providerDef = BUILT_IN_PROVIDERS[provider];
     const url =
@@ -298,16 +305,40 @@ export async function* chatStream(messages, options) {
         `API key required for ${provider} (set ${providerDef?.apiKeyEnv || "API key"})`,
       );
     }
-    fullResponse = await streamOpenAI(
-      messages,
-      model,
-      url,
-      key,
-      onToken,
-      onUsage,
-    );
+    providerCall = () =>
+      streamOpenAI(messages, model, url, key, onToken, onUsage);
   }
 
+  // Run the provider stream concurrently with the queue-drain loop. finally
+  // flips `done` and wakes the waiter so a stream that ends without emitting
+  // any token still terminates the generator cleanly.
+  const streamPromise = (async () => {
+    try {
+      return await providerCall();
+    } finally {
+      done = true;
+      wake();
+    }
+  })();
+  // Swallow-only handler so an early rejection isn't logged as unhandled
+  // before the consumer reaches `await streamPromise` below. The eventual
+  // await still rethrows.
+  streamPromise.catch(() => {});
+
+  while (true) {
+    if (queue.length > 0) {
+      yield { type: "response-token", token: queue.shift() };
+      continue;
+    }
+    if (done) break;
+    await new Promise((resolve) => {
+      waiter = resolve;
+    });
+  }
+
+  // Rethrows if providerCall rejected.
+  const fullResponse = await streamPromise;
+
   // Phase J — auto-record token usage to JSONL session store so
   // `cc session usage` and the `usage.*` WS routes see real data.
   if (sessionId && capturedUsage) {
@@ -325,11 +356,6 @@ export async function* chatStream(messages, options) {
     }
   }
 
-  // Yield all collected tokens
-  for (const token of tokens) {
-    yield { type: "response-token", token };
-  }
-
   yield { type: "response-complete", content: fullResponse };
 }
 

package/src/assets/web-panel/assets/chat-CAmp7Hj4.js

@@ -1 +0,0 @@
-import{E as gt,r as T,a as v,f as St}from"./vendor-Ci2pTZ_t.js";import{u as g}from"./index-CWc9qPWf.js";let Y=0;function Q(s){return Y+=1,`msg_${Date.now()}_${Y}_${s}`}const C=Object.freeze({USER:"user",ASSISTANT:"assistant",SYSTEM:"system",INTENT_RECOGNITION:"intent-recognition",INTENT_CONFIRMATION:"intent-confirmation",TASK_ANALYSIS:"task-analysis",INTERVIEW:"interview",TASK_PLAN:"task-plan",PROGRESS:"progress",ERROR:"error"}),K=Object.freeze({USER:"user",ASSISTANT:"assistant",SYSTEM:"system"});function yt(s,i){return{id:Q("intent_confirmation"),role:K.ASSISTANT,type:C.INTENT_CONFIRMATION,content:"我理解您的需求如下，请确认：",timestamp:Date.now(),metadata:{originalInput:s,understanding:i||{},status:"pending",correction:null}}}function Tt(s,i,u={}){const{reason:l,extractedInfo:p}=u,m={CONTINUE_EXECUTION:"✅ 收到，继续执行任务...",MODIFY_REQUIREMENT:`⚠️ 检测到需求变更：${p||i}`,CLARIFICATION:`📝 已记录补充信息：${p||i}`,CANCEL_TASK:"❌ 任务已取消"};return{id:Q("intent_system"),role:K.SYSTEM,type:C.SYSTEM,content:m[s]||"⚠️ 未识别意图",timestamp:Date.now(),metadata:{intent:s,reason:l,userInput:i,extractedInfo:p}}}const k="新对话",P="新 Agent",B="cc.web-panel.chat.contextMode",G=["project","file","global"],J="cc.web-panel.chat.intentDecisions",$=200,X="cc.web-panel.chat.intentEnabled";function ht(){try{const s=typeof localStorage<"u"?localStorage.getItem(B):null;return G.includes(s)?s:null}catch{return null}}function Et(){try{return typeof localStorage>"u"?!1:localStorage.getItem(X)==="true"}catch{return!1}}function z(){try{if(typeof localStorage>"u")return{};const s=localStorage.getItem(J);if(!s)return{};const i=JSON.parse(s);return i&&typeof i=="object"?i:{}}catch{return{}}}function wt(s){try{if(typeof localStorage>"u")return;const i=Object.entries(s);if(i.length>$){i.sort((l,p)=>(l[1]?.ts||0)-(p[1]?.ts||0));const u=i.slice(-$);s=Object.fromEntries(u)}localStorage.setItem(J,JSON.stringify(s))}catch{}}function F(s,i,u){if(!s||!i)return;const l=z();l[`${s}::${i}`]={...u,ts:Date.now()},wt(l)}function _t(s,i){return!s||!i?null:z()[`${s}::${i}`]||null}const Nt={"assistant.delta":"response-token","assistant.final":"response-complete","assistant.message":"response-complete","tool.call.started":"tool-executing","tool.call.completed":"tool-result","tool.call.failed":"tool-result","slot.filling":"question","approval.requested":"question",error:"error"},It=gt("chat",()=>{const s=T([]),i=T(null),u=v({}),l=v({}),p=v({}),m=v({}),j=(typeof window<"u"&&window.__CC_CONFIG__||{}).mode==="project",V=j?"project":"global",O=ht(),M=T(O==="file"||O==="project"&&!j?"global":O||V);function W(t){if(G.includes(t)){M.value=t;try{typeof localStorage<"u"&&localStorage.setItem(B,t)}catch{}}}const E=T(Et());function H(t){E.value=!!t;try{typeof localStorage<"u"&&localStorage.setItem(X,E.value?"true":"false")}catch{}}const w="cc.web-panel.chat.customQuickPrompts";function Z(){try{if(typeof localStorage>"u")return null;const t=localStorage.getItem(w);if(!t)return null;const e=JSON.parse(t);if(!Array.isArray(e))return null;const n=e.map(o=>typeof o=="string"?o.trim():"").filter(o=>o.length>0&&o.length<=120).slice(0,12);return n.length>0?n:null}catch{return null}}const I=T(Z());function tt(t){if(t==null){I.value=null;try{typeof localStorage<"u"&&localStorage.removeItem(w)}catch{}return}if(!Array.isArray(t))return;const e=t.map(n=>typeof n=="string"?n.trim():"").filter(n=>n.length>0&&n.length<=120).slice(0,12);I.value=e.length>0?e:null;try{typeof localStorage<"u"&&(e.length>0?localStorage.setItem(w,JSON.stringify(e)):localStorage.removeItem(w))}catch{}}const D=T(null);let L=0;function et({prompt:t,autoSend:e=!0,session:n=null}={}){!t||!String(t).trim()||(L+=1,D.value={prompt:String(t),autoSend:e!==!1,session:n||null,token:`staged::${L}::${Date.now()}`})}function nt(){D.value=null}let U=null;const q=new Set;function S(t){return u[t]||(u[t]=[]),u[t]}function x(t){return!!(t&&m[t])}function y(t,e){t&&(m[t]=!!e)}function R(t){if(!t?.id)return;const e=s.value.find(n=>n.id===t.id);if(e){Object.assign(e,t);return}s.value.unshift(t)}function b(t,e=g()){u[t]||(u[t]=[]),l[t]||(l[t]={content:"",active:!1}),m[t]==null&&(m[t]=!1),!q.has(t)&&(q.add(t),e.onSession(t,n=>rt(t,n)))}function _(t=g()){U||(U=t.onRuntimeEvent(e=>{const n=e.payload||{},o=n.record||{};if(e.type==="session:start"){const a=n.sessionType||o.type||"chat";y(n.sessionId,!1),R({id:n.sessionId,type:a,provider:o.provider||null,model:o.model||null,projectRoot:o.projectRoot||null,status:o.status||"created",title:a==="chat"?k:P,createdAt:Date.now(),messageCount:o.messageCount??0})}else if(e.type==="session:resume"){const a=n.sessionId;if(!a)return;Array.isArray(n.history)&&(u[a]=n.history.map(r=>({role:r.role,content:r.content,timestamp:r.timestamp||Date.now()}))),l[a]||(l[a]={content:"",active:!1}),m[a]==null&&(m[a]=!1),R({id:a,type:o.type||null,provider:o.provider||null,model:o.model||null,projectRoot:o.projectRoot||null,status:o.status||"resumed",messageCount:o.messageCount??(Array.isArray(n.history)?n.history.length:0)})}else if(e.type==="session:end"){const a=n.sessionId;s.value=s.value.filter(r=>r.id!==a),delete m[a],i.value===a&&(i.value=s.value[0]?.id||null)}}))}async function ot(){const t=g();_(t),s.value=await t.listSessions(),s.value.forEach(e=>{b(e.id,t)})}async function at(t="chat",e={}){const n=g();_(n);const o=await n.createSession(t,null,e);return R({id:o,type:t,title:t==="chat"?k:P,createdAt:Date.now(),messageCount:0}),y(o,!1),b(o,n),i.value=o,o}function rt(t,e){const n=S(t),o=Nt[e.type]||e.type,a=e.payload||{};if(o==="response-token"){l[t]||(l[t]={content:"",active:!0});const r=e.token||a.token||a.delta||a.content||"";l[t].content+=r,l[t].active=!0,y(t,!0)}else if(o==="response-complete"){const r=e.content||a.content||l[t]?.content||"";n.push({role:"assistant",content:r,timestamp:Date.now()}),l[t]&&(l[t].content="",l[t].active=!1);const f=s.value.find(c=>c.id===t);if(f&&(f.title===k||f.title===P)){const c=n.find(N=>N.role==="user");c&&(f.title=c.content.slice(0,30))}f&&(f.messageCount=n.filter(c=>c.role!=="tool").length),y(t,!1)}else if(o==="tool-executing")n.push({role:"tool",tool:e.tool||a.tool||a.toolName||"unknown",input:e.input||a.input||a.args||null,status:"running",timestamp:Date.now()}),y(t,!0);else if(o==="tool-result"){const r=e.tool||a.tool||a.toolName||"unknown",f=[...n].reverse().find(c=>c.role==="tool"&&c.tool===r);f&&(f.result=e.result||a.result||a.output||null,f.status="done")}else if(o==="question")p[t]={requestId:e.requestId||a.requestId||e.id,question:e.question||a.question||a.message||"",choices:e.choices||a.choices||a.options||[]},y(t,!1);else if(o==="error"){const r=e.message||a.message||"Unknown error";n.push({role:"assistant",content:`Error: ${r}`,timestamp:Date.now()}),y(t,!1),l[t]&&(l[t].active=!1)}}async function h(t,e){const n=g();_(n),S(t).push({role:"user",content:e,timestamp:Date.now()}),l[t]||(l[t]={content:"",active:!1}),l[t].active=!0,y(t,!0),n.sendSessionMessage(t,e)}async function st(t,e){if(!t||!e?.trim())return;const n=M.value;if(n==="global"||!E.value){await h(t,e);return}const o=g(),a=S(t).filter(d=>d.role==="user"||d.role==="assistant").slice(-5).map(d=>({role:d.role,content:String(d.content||"").slice(0,500)})),r=yt(e,{});r.metadata&&(r.metadata.streaming=!0,r.metadata.streamingTokens=0),r.content="理解中…";const f=S(t);f.push(r);let c=null;const N=new AbortController,mt=setTimeout(()=>N.abort(new Error("Intent understand wall-clock timeout")),9e4);try{const d=await o.sendStream({type:"chat.intent.understand-stream",sessionId:t,userInput:e,contextMode:n,history:a},{onChunk:()=>{r.metadata&&(r.metadata.streamingTokens=(r.metadata.streamingTokens||0)+1)},idleMs:6e4,signal:N.signal});d?.success&&(c=d)}catch{}finally{clearTimeout(mt)}if(!(c&&(c.correctedInput&&c.correctedInput!==e||Array.isArray(c.keyPoints)&&c.keyPoints.length>0))){const d=f.indexOf(r);d>=0&&f.splice(d,1),await h(t,e);return}r.content="我理解您的需求如下，请确认：",r.metadata&&(r.metadata.streaming=!1,r.metadata.understanding={correctedInput:c.correctedInput,intent:c.intent,keyPoints:c.keyPoints});const A=_t(t,r.id);A?.status&&r.metadata&&(r.metadata.status=A.status,A.correction&&(r.metadata.correction=A.correction))}async function it(t,e){const o=S(t).find(r=>r.id===e);if(!o||o.type!==C.INTENT_CONFIRMATION)return;o.metadata&&(o.metadata.status="confirmed"),F(t,e,{status:"confirmed",correction:null});const a=o.metadata?.originalInput||"";a.trim()&&await h(t,a)}async function lt(t,e,n){const a=S(t).find(f=>f.id===e);if(!a||a.type!==C.INTENT_CONFIRMATION)return;a.metadata&&(a.metadata.status="corrected",a.metadata.correction=n),F(t,e,{status:"corrected",correction:n});const r=(n||"").trim();r&&await h(t,r)}async function ct(t,e,n={}){const o=g();try{return await o.sendRaw({type:"chat.intent.classify-followup",sessionId:t,input:e,context:n},2e4)}catch{return null}}function ut(t,e,n,o={}){S(t).push(Tt(e,n,o))}function ft(t,e){const n=g(),o=p[t];o&&(n.answerQuestion(t,o.requestId,e),delete p[t])}async function dt(t){const e=g();if(_(e),i.value=t,b(t,e),!u[t]||u[t].length===0)try{await e.resumeSession(t)}catch{}}const pt=St(()=>x(i.value));return{sessions:s,currentSessionId:i,messages:u,streaming:l,pendingQuestion:p,loadingBySession:m,isLoading:pt,contextMode:M,setContextMode:W,intentEnabled:E,setIntentEnabled:H,customQuickPrompts:I,setCustomQuickPrompts:tt,pendingAutoSend:D,scheduleAutoSend:et,clearAutoSend:nt,getIsLoading:x,loadSessions:ot,createSession:at,sendMessage:h,submitUserInput:st,confirmIntent:it,correctIntent:lt,classifyFollowupIntent:ct,pushFollowupIntentBanner:ut,answerQuestion:ft,switchSession:dt,getMessages:S}});export{C as M,It as u};

package/src/assets/web-panel/assets/index-4FtfPG2_.js

@@ -1 +0,0 @@
-import{C as o}from"./Col-DY5o3xw5.js";import{R as t}from"./index-CWc9qPWf.js";import"./index-BWjGDulF.js";import"./vendor-Ci2pTZ_t.js";import"./icons-B2G69bhT.js";const s=t(o);export{s as default};

package/src/assets/web-panel/assets/index-Ri5xYTdD.js

@@ -1 +0,0 @@
-import{A as o}from"./Row-C-x3K6Kz.js";import{R as t}from"./index-CWc9qPWf.js";import"./responsiveObserve-aP8GIgAb.js";import"./vendor-Ci2pTZ_t.js";import"./useFlexGapSupport-Do-bHuEg.js";import"./styleChecker-B8gy0RNi.js";import"./index-BWjGDulF.js";import"./icons-B2G69bhT.js";const l=t(o);export{l as default};