@zibby/core 0.4.4 → 0.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +135 -135
- package/dist/package.json +1 -1
- package/dist/register-built-in-strategies.js +32 -32
- package/dist/skills/session/index.js +1 -1
- package/dist/skills/session/session-skill.js +1 -1
- package/dist/strategies/claude-strategy.js +2 -2
- package/dist/strategies/index.js +45 -45
- package/package.json +1 -1
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import{AgentStrategy as re,getSkill as ie}from"@zibby/agent-workflow";import{query as ce}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as le}from"zod-to-json-schema";import{writeFileSync as
|
|
1
|
+
import{AgentStrategy as re,getSkill as ie}from"@zibby/agent-workflow";import{query as ce}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as le}from"zod-to-json-schema";import{writeFileSync as P,mkdirSync as R,existsSync as Q,readFileSync as V}from"fs";import{homedir as ee}from"os";import{join as E}from"path";import N from"chalk";var m={debug:0,info:1,warn:2,error:3,silent:4},b=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return m.debug;if(process.env.ZIBBY_VERBOSE==="true")return m.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in m?m[e]:m.info}_shouldLog(e){return m[e]>=this._level}_formatMessage(e,s,i={}){let n=new Date().toISOString(),d=`${this._getPrefix(e)} ${s}`;return Object.keys(i).length>0&&(d+=N.dim(` ${JSON.stringify(i)}`)),d}_getPrefix(e){return{debug:N.gray("[DEBUG]"),info:N.cyan("[INFO]"),warn:N.yellow("[WARN]"),error:N.red("\u274C [ERROR]")}[e]||""}debug(e,s){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,s))}info(e,s){this._shouldLog("info")&&console.log(this._formatMessage("info",e,s))}warn(e,s){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,s))}error(e,s){this._shouldLog("error")&&console.error(this._formatMessage("error",e,s))}setLevel(e){e in m&&(this._level=m[e])}getLevel(){return Object.keys(m).find(e=>m[e]===this._level)}},r=new b;import{timeline as I,Timeline as _e,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as he}from"@zibby/agent-workflow";var x={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-2.5-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var M={auto:"claude-sonnet-4-6","sonnet-4.6":"claude-sonnet-4-6","sonnet-4-6":"claude-sonnet-4-6","opus-4.6":"claude-opus-4-6","opus-4-6":"claude-opus-4-6","sonnet-4.5":"claude-sonnet-4-5-20250929","sonnet-4-5":"claude-sonnet-4-5-20250929","opus-4.5":"claude-opus-4-20250514","opus-4-5":"claude-opus-4-20250514","claude-sonnet-4-6":"claude-sonnet-4-6","claude-opus-4-6":"claude-opus-4-6","claude-sonnet-4-5-20250929":"claude-sonnet-4-5-20250929","claude-opus-4-20250514":"claude-opus-4-20250514"};var Oe={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};function v(a){let e=`${a}_POOL`,s=process.env[e];if(!s||typeof s!="string")return{picked:null,count:0,dispose:()=>{}};let i=s.split(/[,\n]+/).map(d=>d.trim()).filter(Boolean);if(i.length===0)return{picked:null,count:0,dispose:()=>{}};let n=i[Math.floor(Math.random()*i.length)],o=process.env[a];return process.env[a]=n,r.debug(`[auth-pool] ${a}: picked 1 of ${i.length} from pool (***${n.slice(-4)})`),{picked:n,count:i.length,dispose(){o===void 0?delete process.env[a]:process.env[a]=o}}}var z=class extends re{constructor(){super("claude","Claude (Anthropic API)",50)}canHandle(e){let s=!!process.env.ANTHROPIC_API_KEY||!!process.env.ANTHROPIC_API_KEY_POOL,i=!!process.env.CLAUDE_CODE_OAUTH_TOKEN||!!process.env.CLAUDE_CODE_OAUTH_TOKEN_POOL,n=!!process.env.ANTHROPIC_AUTH_TOKEN||!!process.env.ANTHROPIC_AUTH_TOKEN_POOL,o=s||i||n;return o||r.debug("ClaudeAgentStrategy: no credentials. Set one of ANTHROPIC_API_KEY / CLAUDE_CODE_OAUTH_TOKEN / ANTHROPIC_AUTH_TOKEN (or a *_POOL variant for multi-token rotation)."),o}async invoke(e,s={}){let{model:i,workspace:n=process.cwd(),schema:o=null,images:d=[],skills:p=null,sessionPath:_=null,nodeName:L=null,timeout:U,config:K={},signal:S=null,sessionId:J,resume:F,forkSession:te,sessionStore:H}=s,f=i;(!f||f==="auto")&&(r.debug(`Model is '${f||"undefined"}', using default: ${x.CLAUDE}`),f=x.CLAUDE);let T=M[f]||f;M[f]&&f!==T&&r.debug(`Mapped model: ${f} \u2192 ${T}`);let oe=[v("ANTHROPIC_API_KEY"),v("CLAUDE_CODE_OAUTH_TOKEN"),v("ANTHROPIC_AUTH_TOKEN")];try{r.debug(`Invoking Claude Agent SDK with model: ${T}, skills: ${JSON.stringify(p)}`);let O=process.env.CLAUDE_CODE_OAUTH_TOKEN,j=process.env.ANTHROPIC_API_KEY,B=process.env.ANTHROPIC_AUTH_TOKEN;process.env.CLAUDE_CODE_CREDENTIALS_JSON?de(process.env.CLAUDE_CODE_CREDENTIALS_JSON):O&&ue(O,process.env.__ZIBBY_CLAUDE_PLAN);let $=process.env.__ZIBBY_CLAUDE_PLAN,G=$?$.charAt(0).toUpperCase()+$.slice(1):null,y;O?y=G?`Claude ${G} plan \xB7 ***${O.slice(-4)}`:`Subscription \xB7 ***${O.slice(-4)}`:j?y=`API key \xB7 ***${j.slice(-4)}`:B?y=`Bearer \xB7 ***${B.slice(-4)}`:y="NONE \u2014 request will fail";let h=(await import("chalk")).default;console.log(""),console.log(` ${h.cyan("\u25C6")} ${h.bold(T)}`),console.log(` ${h.dim("Auth: ")}${y}`),console.log(` ${h.dim("Workdir: ")}${n}`),console.log(""),console.log(h.bold("Prompt sent to LLM:")),console.log(h.dim("\u2500".repeat(60))),console.log(h.dim(e)),console.log(h.dim("\u2500".repeat(60)));let{allowedTools:W,mcpServers:C}=this._resolveSkills(p,{sessionPath:_,workspace:n,nodeName:L});try{let g={cwd:n,allowedTools:W,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:T,...Object.keys(C).length>0&&{mcpServers:C},...J&&{sessionId:J},...F&&{resume:F},...te&&{forkSession:!0},...H&&{sessionStore:H}};if(o){let A=typeof o.parse=="function"?le(o,{target:"openApi3"}):o;g.outputFormat={type:"json_schema",schema:A},r.debug("Structured output enforced via SDK outputFormat")}r.debug(`Agent SDK options: ${JSON.stringify({cwd:g.cwd,toolCount:W.length,permissionMode:g.permissionMode,model:g.model,hasOutputFormat:!!g.outputFormat})}`);let D="",Y=0,Z=[];r.debug("Starting Claude Agent SDK query stream");let q;try{q=ce({prompt:e,options:g})}catch(t){throw r.error(`Failed to initialize Claude Agent SDK: ${t.message}`),t}let X=null,k=0,se=3;if(S?.aborted){let t=new Error("Aborted via signal");throw t.name="AbortError",t}try{for await(let t of q){if(S?.aborted){let l=new Error("Aborted via signal");throw l.name="AbortError",l}if(Z.push(t),t.type==="system"&&t.subtype==="init"){let l=t.mcp_servers||[];if(l.length>0){let c=l.map(u=>`${u.name}=${u.status}${u.error?` (${String(u.error).slice(0,120)})`:""}`).join(", ");r.info(`[mcp] SDK init \u2014 ${l.length} server(s): ${c}`);for(let u of l)u.status!=="connected"&&r.warn(`[mcp] server '${u.name}' did not connect: status=${u.status}`,{name:u.name,status:u.status,error:u.error})}else Object.keys(C||{}).length>0&&r.warn(`[mcp] SDK init returned no mcp_servers despite passing ${Object.keys(C).length} server(s) \u2014 SDK version may not expose this field, or config was dropped`);if(Array.isArray(t.tools)){let c=t.tools.filter(u=>u.startsWith("mcp__"));c.length>0?r.info(`[mcp] tools visible to model: ${c.join(", ")}`):Object.keys(C||{}).length>0&&r.warn("[mcp] no mcp__* tools in model's tool list \u2014 MCP servers configured but tools didn't reach the prompt")}}if(t.type==="error"||t.error){let l=t.error?.message||t.error||t.message||"Unknown API error";try{r.error("SDK error event raw payload",{fullMessage:JSON.stringify(t,null,2)})}catch{}throw new Error(typeof l=="string"?l:JSON.stringify(l))}let A=JSON.stringify(t.message?.content||t.text||"").slice(0,200);if(A===X){if(k++,k>=se){let l=(t.message?.content?.[0]?.text||t.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${k}x repeated): ${l}`)}}else X=A,k=1;if(t.type==="assistant"||t.constructor?.name==="AssistantMessage"){let l=t.message?.content||t.content||[];for(let c of l)if(c.type==="thinking"&&c.thinking)console.log(`${c.thinking.substring(0,200)}${c.thinking.length>200?"...":""}`);else if(c.type==="text"&&c.text)D+=c.text,c.text.length<500?console.log(`${c.text}`):console.log(`${c.text.substring(0,200)}... (${c.text.length} chars)`);else if(c.type==="tool_use"){Y++,c.name.includes("memory")?I.stepMemory(`Tool: ${c.name}`):I.stepTool(`Tool: ${c.name}`);let ne=JSON.stringify(c.input).substring(0,100);console.log(` Input: ${ne}${JSON.stringify(c.input).length>100?"...":""}`)}}else if(!(t.type==="user"&&t.tool_use_result)){if(t.type==="result"||t.constructor?.name==="ResultMessage"){let l=t.result||t.text||t.content||D;try{ae({message:t,sessionPath:_,nodeName:L,model:f,toolCallCount:Y})}catch(c){r.debug(`usage.json write failed: ${c.message}`)}if(o){if(t.structured_output){r.debug("Using SDK native structured_output");let u=typeof o.parse=="function"?o.parse(t.structured_output):t.structured_output;return{raw:l,structured:u}}if(l){let c=this._extractJson(l,o);if(c)return{raw:l,structured:c}}r.warn(`Could not extract structured output \u2014 returning raw text (${(l||"").length} chars)`)}return l||""}}}if(r.warn(`Agent SDK ended without result. Collected ${Z.length} messages`),D.length>0)return r.debug("Returning accumulated text from messages"),D;throw new Error("Claude Agent SDK query ended without result")}catch(t){let A={message:t?.message,name:t?.name,code:t?.code,cause:t?.cause?.message||t?.cause,stack:t?.stack?.split(`
|
|
2
2
|
`).slice(0,5).join(`
|
|
3
|
-
`),stringified:(()=>{try{return JSON.stringify(t,Object.getOwnPropertyNames(Object(t)))}catch{return String(t)}})()};throw
|
|
3
|
+
`),stringified:(()=>{try{return JSON.stringify(t,Object.getOwnPropertyNames(Object(t)))}catch{return String(t)}})()};throw r.error(`Error during query stream: ${t?.message||t}`,A),t}}catch(g){throw r.error("Claude Agent SDK call failed",{message:g?.message,name:g?.name,code:g?.code,cause:g?.cause?.message||g?.cause}),g}}finally{for(let O of oe)O.dispose()}}_resolveSkills(e,s){let i=["Read","Write","Edit","Bash","Grep","Glob"];if(e===null)return r.debug("No skills \u2014 pure LLM mode"),{allowedTools:[],mcpServers:{}};if(!Array.isArray(e)||e.length===0)return r.debug("Default IDE skills for code generation"),{allowedTools:[...i],mcpServers:{}};let n=[...i],o={};for(let d of e){let p=ie(d);if(!p){r.warn(`Unknown skill "${d}" \u2014 skipping`);continue}if(p.allowedTools&&n.push(...p.allowedTools),typeof p.resolve=="function"){let _=p.resolve(s);_&&(o[p.serverName]=_,r.debug(`MCP: ${p.serverName} \u2192 ${_.command} ${_.args[0]}`))}}return{allowedTools:n,mcpServers:o}}_extractJson(e,s){let i=[()=>{if(e.includes("===JSON_START===")){let n=e.indexOf("===JSON_START===")+16,o=e.indexOf("===JSON_END===");return e.substring(n,o).trim()}},()=>e.match(/```json\s*\n([\s\S]*?)\n```/)?.[1]?.trim(),()=>{if(!e.startsWith("{"))return e.match(/```\s*\n([\s\S]*?)\n```/)?.[1]?.trim()},()=>e.trim(),()=>{let n=e.indexOf("{"),o=e.lastIndexOf("}");if(n!==-1&&o>n)return e.substring(n,o+1)}];for(let n of i)try{let o=n();if(!o)continue;let d=JSON.parse(o);if(typeof d!="object"||d===null)continue;return typeof s.parse=="function"?s.parse(d):d}catch{}return null}};function ae({message:a,sessionPath:e,nodeName:s,model:i,toolCallCount:n}){if(!e||!s)return;let o=a?.usage||a?.message?.usage||{},d=w(o.input_tokens,o.inputTokens),p=w(o.output_tokens,o.outputTokens),_=w(o.cache_read_input_tokens,o.cacheReadInputTokens),L=w(o.cache_creation_input_tokens,o.cacheCreationInputTokens),U=w(a?.duration_ms,a?.durationMs),K={model:i||null,input_tokens:d,output_tokens:p,cache_read_tokens:_,cache_creation_tokens:L,tool_call_count:typeof n=="number"?n:null,duration_ms:U,captured_at:new Date().toISOString()},S=E(e,s);try{R(S,{recursive:!0})}catch{}P(E(S,"usage.json"),JSON.stringify(K,null,2),"utf-8")}function w(...a){for(let e of a){if(typeof e=="number"&&Number.isFinite(e))return e;if(typeof e=="string"&&e.trim()!==""&&!isNaN(Number(e)))return Number(e)}return null}function ue(a,e){let s=E(ee(),".claude"),i=E(s,".credentials.json"),n={claudeAiOauth:{accessToken:a,...e?{subscriptionType:String(e).toLowerCase()}:{}}};try{if(Q(i)&&JSON.parse(V(i,"utf-8"))?.claudeAiOauth?.accessToken===a)return;R(s,{recursive:!0}),P(i,JSON.stringify(n,null,2),"utf-8"),r.debug(`Wrote Claude Code OAuth credentials to ${i}`)}catch(o){r.warn(`Could not write ${i}: ${o.message} \u2014 Claude SDK may fail to authenticate.`)}}function de(a){let e=E(ee(),".claude"),s=E(e,".credentials.json"),i;try{i=JSON.parse(a)}catch(n){r.warn(`CLAUDE_CODE_CREDENTIALS_JSON not valid JSON: ${n.message}`);return}if(!i?.claudeAiOauth?.accessToken){r.warn("CLAUDE_CODE_CREDENTIALS_JSON missing claudeAiOauth.accessToken \u2014 skipping write.");return}try{if(Q(s)){let n=JSON.parse(V(s,"utf-8"));if(n?.claudeAiOauth?.accessToken===i.claudeAiOauth.accessToken&&n?.claudeAiOauth?.expiresAt===i.claudeAiOauth.expiresAt)return}R(e,{recursive:!0}),P(s,JSON.stringify(i,null,2),"utf-8"),r.debug(`Wrote full Claude Code credentials blob to ${s}`)}catch(n){r.warn(`Could not write ${s}: ${n.message} \u2014 Claude SDK may fail to authenticate.`)}}export{z as ClaudeAgentStrategy};
|