@zibby/core 0.4.1 → 0.4.2
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 +155 -158
- package/dist/package.json +3 -2
- package/dist/register-built-in-strategies.js +50 -53
- package/dist/strategies/claude-strategy.js +2 -5
- package/dist/strategies/cursor-strategy.js +32 -33
- package/dist/strategies/gemini-strategy.js +18 -19
- package/dist/strategies/index.js +52 -55
- package/dist/utils/repo-clone.js +1 -0
- package/package.json +3 -2
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
2
|
-
`)}var ee=class extends he{constructor(){super("claude","Claude (Anthropic API)",50)}canHandle(e){let n=!!process.env.ANTHROPIC_API_KEY||!!process.env.ANTHROPIC_API_KEY_POOL,o=!!process.env.CLAUDE_CODE_OAUTH_TOKEN||!!process.env.CLAUDE_CODE_OAUTH_TOKEN_POOL,s=!!process.env.ANTHROPIC_AUTH_TOKEN||!!process.env.ANTHROPIC_AUTH_TOKEN_POOL,r=n||o||s;return r||c.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)."),r}async invoke(e,n={}){let{model:o,workspace:s=process.cwd(),schema:r=null,images:u=[],skills:p=null,sessionPath:m=null,nodeName:w=null,timeout:x,config:U={},signal:A=null,sessionId:M,resume:K,forkSession:ne}=n,g=o;(!g||g==="auto")&&(c.debug(`Model is '${g||"undefined"}', using default: ${$.CLAUDE}`),g=$.CLAUDE);let S=I[g]||g;I[g]&&g!==S&&c.debug(`Mapped model: ${g} \u2192 ${S}`);let se=[k("ANTHROPIC_API_KEY"),k("CLAUDE_CODE_OAUTH_TOKEN"),k("ANTHROPIC_AUTH_TOKEN")];try{c.debug(`Invoking Claude Agent SDK with model: ${S}, skills: ${JSON.stringify(p)}`);let _=process.env.CLAUDE_CODE_OAUTH_TOKEN,J=process.env.ANTHROPIC_API_KEY,H=process.env.ANTHROPIC_AUTH_TOKEN;process.env.CLAUDE_CODE_CREDENTIALS_JSON?Te(process.env.CLAUDE_CODE_CREDENTIALS_JSON):_&&Se(_,process.env.__ZIBBY_CLAUDE_PLAN);let b=process.env.__ZIBBY_CLAUDE_PLAN,B=b?b.charAt(0).toUpperCase()+b.slice(1):null,T;_?T=B?`Claude ${B} plan \xB7 ***${_.slice(-4)}`:`Subscription \xB7 ***${_.slice(-4)}`:J?T=`API key \xB7 ***${J.slice(-4)}`:H?T=`Bearer \xB7 ***${H.slice(-4)}`:T="NONE \u2014 request will fail";let h=(await import("chalk")).default,F=V(),G=F?`${F}
|
|
3
|
-
|
|
4
|
-
${e}`:e;console.log(""),console.log(` ${h.cyan("\u25C6")} ${h.bold(S)}`),console.log(` ${h.dim("Auth: ")}${T}`),console.log(` ${h.dim("Workdir: ")}${s}`),console.log(""),console.log(h.bold("Prompt sent to LLM:")),console.log(h.dim("\u2500".repeat(60))),console.log(h.dim(G)),console.log(h.dim("\u2500".repeat(60)));let{allowedTools:j,mcpServers:W}=this._resolveSkills(p,{sessionPath:m,workspace:s,nodeName:w});try{let d={cwd:s,allowedTools:j,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:S,...Object.keys(W).length>0&&{mcpServers:W},...M&&{sessionId:M},...K&&{resume:K},...ne&&{forkSession:!0}};if(r){let O=typeof r.parse=="function"?Ee(r,{target:"openApi3"}):r;d.outputFormat={type:"json_schema",schema:O},c.debug("Structured output enforced via SDK outputFormat")}c.debug(`Agent SDK options: ${JSON.stringify({cwd:d.cwd,toolCount:j.length,permissionMode:d.permissionMode,model:d.model,hasOutputFormat:!!d.outputFormat})}`);let N="",Y=0,Z=[];c.debug("Starting Claude Agent SDK query stream");let q;try{q=Oe({prompt:G,options:d})}catch(t){throw c.error(`Failed to initialize Claude Agent SDK: ${t.message}`),t}let z=null,L=0,ie=3;if(A?.aborted){let t=new Error("Aborted via signal");throw t.name="AbortError",t}try{for await(let t of q){if(A?.aborted){let l=new Error("Aborted via signal");throw l.name="AbortError",l}if(Z.push(t),t.type==="error"||t.error){let l=t.error?.message||t.error||t.message||"Unknown API error";try{c.error("SDK error event raw payload",{fullMessage:JSON.stringify(t,null,2)})}catch{}throw new Error(typeof l=="string"?l:JSON.stringify(l))}let O=JSON.stringify(t.message?.content||t.text||"").slice(0,200);if(O===z){if(L++,L>=ie){let l=(t.message?.content?.[0]?.text||t.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${L}x repeated): ${l}`)}}else z=O,L=1;if(t.type==="assistant"||t.constructor?.name==="AssistantMessage"){let l=t.message?.content||t.content||[];for(let a of l)if(a.type==="thinking"&&a.thinking)console.log(`${a.thinking.substring(0,200)}${a.thinking.length>200?"...":""}`);else if(a.type==="text"&&a.text)N+=a.text,a.text.length<500?console.log(`${a.text}`):console.log(`${a.text.substring(0,200)}... (${a.text.length} chars)`);else if(a.type==="tool_use"){Y++,a.name.includes("memory")?D.stepMemory(`Tool: ${a.name}`):D.stepTool(`Tool: ${a.name}`);let ce=JSON.stringify(a.input).substring(0,100);console.log(` Input: ${ce}${JSON.stringify(a.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||N;try{Ae({message:t,sessionPath:m,nodeName:w,model:g,toolCallCount:Y})}catch(a){c.debug(`usage.json write failed: ${a.message}`)}if(r){if(t.structured_output){c.debug("Using SDK native structured_output");let X=typeof r.parse=="function"?r.parse(t.structured_output):t.structured_output;return{raw:l,structured:X}}if(l){let a=this._extractJson(l,r);if(a)return{raw:l,structured:a}}c.warn(`Could not extract structured output \u2014 returning raw text (${(l||"").length} chars)`)}return l||""}}}if(c.warn(`Agent SDK ended without result. Collected ${Z.length} messages`),N.length>0)return c.debug("Returning accumulated text from messages"),N;throw new Error("Claude Agent SDK query ended without result")}catch(t){let O={message:t?.message,name:t?.name,code:t?.code,cause:t?.cause?.message||t?.cause,stack:t?.stack?.split(`
|
|
1
|
+
import{AgentStrategy as se,getSkill as re}from"@zibby/agent-workflow";import{query as ie}from"@anthropic-ai/claude-agent-sdk";import{zodToJsonSchema as ce}from"zod-to-json-schema";import{writeFileSync as x,mkdirSync as P,existsSync as z,readFileSync as Q}from"fs";import{homedir as V}from"os";import{join as A}from"path";import C from"chalk";var f={debug:0,info:1,warn:2,error:3,silent:4},v=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return f.debug;if(process.env.ZIBBY_VERBOSE==="true")return f.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in f?f[e]:f.info}_shouldLog(e){return f[e]>=this._level}_formatMessage(e,n,r={}){let s=new Date().toISOString(),a=`${this._getPrefix(e)} ${n}`;return Object.keys(r).length>0&&(a+=C.dim(` ${JSON.stringify(r)}`)),a}_getPrefix(e){return{debug:C.gray("[DEBUG]"),info:C.cyan("[INFO]"),warn:C.yellow("[WARN]"),error:C.red("\u274C [ERROR]")}[e]||""}debug(e,n){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,n))}info(e,n){this._shouldLog("info")&&console.log(this._formatMessage("info",e,n))}warn(e,n){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,n))}error(e,n){this._shouldLog("error")&&console.error(this._formatMessage("error",e,n))}setLevel(e){e in f&&(this._level=f[e])}getLevel(){return Object.keys(f).find(e=>f[e]===this._level)}},i=new v;import{timeline as I,Timeline as me,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as _e}from"@zibby/agent-workflow";var b={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 $={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 D(l){let e=`${l}_POOL`,n=process.env[e];if(!n||typeof n!="string")return{picked:null,count:0,dispose:()=>{}};let r=n.split(/[,\n]+/).map(a=>a.trim()).filter(Boolean);if(r.length===0)return{picked:null,count:0,dispose:()=>{}};let s=r[Math.floor(Math.random()*r.length)],o=process.env[l];return process.env[l]=s,i.debug(`[auth-pool] ${l}: picked 1 of ${r.length} from pool (***${s.slice(-4)})`),{picked:s,count:r.length,dispose(){o===void 0?delete process.env[l]:process.env[l]=o}}}var X=class extends se{constructor(){super("claude","Claude (Anthropic API)",50)}canHandle(e){let n=!!process.env.ANTHROPIC_API_KEY||!!process.env.ANTHROPIC_API_KEY_POOL,r=!!process.env.CLAUDE_CODE_OAUTH_TOKEN||!!process.env.CLAUDE_CODE_OAUTH_TOKEN_POOL,s=!!process.env.ANTHROPIC_AUTH_TOKEN||!!process.env.ANTHROPIC_AUTH_TOKEN_POOL,o=n||r||s;return o||i.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,n={}){let{model:r,workspace:s=process.cwd(),schema:o=null,images:a=[],skills:d=null,sessionPath:m=null,nodeName:N=null,timeout:R,config:M={},signal:E=null,sessionId:U,resume:K,forkSession:ee}=n,g=r;(!g||g==="auto")&&(i.debug(`Model is '${g||"undefined"}', using default: ${b.CLAUDE}`),g=b.CLAUDE);let S=$[g]||g;$[g]&&g!==S&&i.debug(`Mapped model: ${g} \u2192 ${S}`);let te=[D("ANTHROPIC_API_KEY"),D("CLAUDE_CODE_OAUTH_TOKEN"),D("ANTHROPIC_AUTH_TOKEN")];try{i.debug(`Invoking Claude Agent SDK with model: ${S}, skills: ${JSON.stringify(d)}`);let O=process.env.CLAUDE_CODE_OAUTH_TOKEN,J=process.env.ANTHROPIC_API_KEY,F=process.env.ANTHROPIC_AUTH_TOKEN;process.env.CLAUDE_CODE_CREDENTIALS_JSON?ae(process.env.CLAUDE_CODE_CREDENTIALS_JSON):O&&ue(O,process.env.__ZIBBY_CLAUDE_PLAN);let k=process.env.__ZIBBY_CLAUDE_PLAN,H=k?k.charAt(0).toUpperCase()+k.slice(1):null,T;O?T=H?`Claude ${H} plan \xB7 ***${O.slice(-4)}`:`Subscription \xB7 ***${O.slice(-4)}`:J?T=`API key \xB7 ***${J.slice(-4)}`:F?T=`Bearer \xB7 ***${F.slice(-4)}`:T="NONE \u2014 request will fail";let _=(await import("chalk")).default;console.log(""),console.log(` ${_.cyan("\u25C6")} ${_.bold(S)}`),console.log(` ${_.dim("Auth: ")}${T}`),console.log(` ${_.dim("Workdir: ")}${s}`),console.log(""),console.log(_.bold("Prompt sent to LLM:")),console.log(_.dim("\u2500".repeat(60))),console.log(_.dim(e)),console.log(_.dim("\u2500".repeat(60)));let{allowedTools:B,mcpServers:G}=this._resolveSkills(d,{sessionPath:m,workspace:s,nodeName:N});try{let p={cwd:s,allowedTools:B,settings:{permissions:{allow:["Bash(*)","Read(*)","Write(*)","Edit(*)","MultiEdit(*)","NotebookEdit(*)","Grep(*)","Glob(*)","WebFetch(*)","WebSearch(*)","Task(*)","TodoWrite(*)","Skill(*)"]}},model:S,...Object.keys(G).length>0&&{mcpServers:G},...U&&{sessionId:U},...K&&{resume:K},...ee&&{forkSession:!0}};if(o){let h=typeof o.parse=="function"?ce(o,{target:"openApi3"}):o;p.outputFormat={type:"json_schema",schema:h},i.debug("Structured output enforced via SDK outputFormat")}i.debug(`Agent SDK options: ${JSON.stringify({cwd:p.cwd,toolCount:B.length,permissionMode:p.permissionMode,model:p.model,hasOutputFormat:!!p.outputFormat})}`);let L="",j=0,W=[];i.debug("Starting Claude Agent SDK query stream");let Y;try{Y=ie({prompt:e,options:p})}catch(t){throw i.error(`Failed to initialize Claude Agent SDK: ${t.message}`),t}let Z=null,w=0,oe=3;if(E?.aborted){let t=new Error("Aborted via signal");throw t.name="AbortError",t}try{for await(let t of Y){if(E?.aborted){let u=new Error("Aborted via signal");throw u.name="AbortError",u}if(W.push(t),t.type==="error"||t.error){let u=t.error?.message||t.error||t.message||"Unknown API error";try{i.error("SDK error event raw payload",{fullMessage:JSON.stringify(t,null,2)})}catch{}throw new Error(typeof u=="string"?u:JSON.stringify(u))}let h=JSON.stringify(t.message?.content||t.text||"").slice(0,200);if(h===Z){if(w++,w>=oe){let u=(t.message?.content?.[0]?.text||t.text||"unknown").slice(0,100);throw new Error(`API stuck in loop (${w}x repeated): ${u}`)}}else Z=h,w=1;if(t.type==="assistant"||t.constructor?.name==="AssistantMessage"){let u=t.message?.content||t.content||[];for(let c of u)if(c.type==="thinking"&&c.thinking)console.log(`${c.thinking.substring(0,200)}${c.thinking.length>200?"...":""}`);else if(c.type==="text"&&c.text)L+=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"){j++,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 u=t.result||t.text||t.content||L;try{le({message:t,sessionPath:m,nodeName:N,model:g,toolCallCount:j})}catch(c){i.debug(`usage.json write failed: ${c.message}`)}if(o){if(t.structured_output){i.debug("Using SDK native structured_output");let q=typeof o.parse=="function"?o.parse(t.structured_output):t.structured_output;return{raw:u,structured:q}}if(u){let c=this._extractJson(u,o);if(c)return{raw:u,structured:c}}i.warn(`Could not extract structured output \u2014 returning raw text (${(u||"").length} chars)`)}return u||""}}}if(i.warn(`Agent SDK ended without result. Collected ${W.length} messages`),L.length>0)return i.debug("Returning accumulated text from messages"),L;throw new Error("Claude Agent SDK query ended without result")}catch(t){let h={message:t?.message,name:t?.name,code:t?.code,cause:t?.cause?.message||t?.cause,stack:t?.stack?.split(`
|
|
5
2
|
`).slice(0,5).join(`
|
|
6
|
-
`),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 i.error(`Error during query stream: ${t?.message||t}`,h),t}}catch(p){throw i.error("Claude Agent SDK call failed",{message:p?.message,name:p?.name,code:p?.code,cause:p?.cause?.message||p?.cause}),p}}finally{for(let O of te)O.dispose()}}_resolveSkills(e,n){let r=["Read","Write","Edit","Bash","Grep","Glob"];if(e===null)return i.debug("No skills \u2014 pure LLM mode"),{allowedTools:[],mcpServers:{}};if(!Array.isArray(e)||e.length===0)return i.debug("Default IDE skills for code generation"),{allowedTools:[...r],mcpServers:{}};let s=[...r],o={};for(let a of e){let d=re(a);if(!d){i.warn(`Unknown skill "${a}" \u2014 skipping`);continue}if(d.allowedTools&&s.push(...d.allowedTools),typeof d.resolve=="function"){let m=d.resolve(n);m&&(o[d.serverName]=m,i.debug(`MCP: ${d.serverName} \u2192 ${m.command} ${m.args[0]}`))}}return{allowedTools:s,mcpServers:o}}_extractJson(e,n){let r=[()=>{if(e.includes("===JSON_START===")){let s=e.indexOf("===JSON_START===")+16,o=e.indexOf("===JSON_END===");return e.substring(s,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 s=e.indexOf("{"),o=e.lastIndexOf("}");if(s!==-1&&o>s)return e.substring(s,o+1)}];for(let s of r)try{let o=s();if(!o)continue;let a=JSON.parse(o);if(typeof a!="object"||a===null)continue;return typeof n.parse=="function"?n.parse(a):a}catch{}return null}};function le({message:l,sessionPath:e,nodeName:n,model:r,toolCallCount:s}){if(!e||!n)return;let o=l?.usage||l?.message?.usage||{},a=y(o.input_tokens,o.inputTokens),d=y(o.output_tokens,o.outputTokens),m=y(o.cache_read_input_tokens,o.cacheReadInputTokens),N=y(o.cache_creation_input_tokens,o.cacheCreationInputTokens),R=y(l?.duration_ms,l?.durationMs),M={model:r||null,input_tokens:a,output_tokens:d,cache_read_tokens:m,cache_creation_tokens:N,tool_call_count:typeof s=="number"?s:null,duration_ms:R,captured_at:new Date().toISOString()},E=A(e,n);try{P(E,{recursive:!0})}catch{}x(A(E,"usage.json"),JSON.stringify(M,null,2),"utf-8")}function y(...l){for(let e of l){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(l,e){let n=A(V(),".claude"),r=A(n,".credentials.json"),s={claudeAiOauth:{accessToken:l,...e?{subscriptionType:String(e).toLowerCase()}:{}}};try{if(z(r)&&JSON.parse(Q(r,"utf-8"))?.claudeAiOauth?.accessToken===l)return;P(n,{recursive:!0}),x(r,JSON.stringify(s,null,2),"utf-8"),i.debug(`Wrote Claude Code OAuth credentials to ${r}`)}catch(o){i.warn(`Could not write ${r}: ${o.message} \u2014 Claude SDK may fail to authenticate.`)}}function ae(l){let e=A(V(),".claude"),n=A(e,".credentials.json"),r;try{r=JSON.parse(l)}catch(s){i.warn(`CLAUDE_CODE_CREDENTIALS_JSON not valid JSON: ${s.message}`);return}if(!r?.claudeAiOauth?.accessToken){i.warn("CLAUDE_CODE_CREDENTIALS_JSON missing claudeAiOauth.accessToken \u2014 skipping write.");return}try{if(z(n)){let s=JSON.parse(Q(n,"utf-8"));if(s?.claudeAiOauth?.accessToken===r.claudeAiOauth.accessToken&&s?.claudeAiOauth?.expiresAt===r.claudeAiOauth.expiresAt)return}P(e,{recursive:!0}),x(n,JSON.stringify(r,null,2),"utf-8"),i.debug(`Wrote full Claude Code credentials blob to ${n}`)}catch(s){i.warn(`Could not write ${n}: ${s.message} \u2014 Claude SDK may fail to authenticate.`)}}export{X as ClaudeAgentStrategy};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
2
|
-
`);this.buffer=
|
|
3
|
-
`,
|
|
4
|
-
`,this.extractedResult=a)}catch{if(o.includes('"text"')||o.includes('"content"')){let
|
|
1
|
+
import{AgentStrategy as kt,DEFAULT_OUTPUT_BASE as Lt,SESSION_INFO_FILE as Mt,STOP_REQUEST_FILE as Ut,getAllSkills as Dt,getSkill as ct}from"@zibby/agent-workflow";import{spawn as Bt,execSync as F}from"node:child_process";import{writeFileSync as pt,readFileSync as ft,mkdirSync as dt,existsSync as H,accessSync as gt,constants as mt,unlinkSync as Ft}from"node:fs";import{join as $,resolve as Jt}from"node:path";import{homedir as j}from"node:os";import z from"chalk";var P={debug:0,info:1,warn:2,error:3,silent:4},et=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return P.debug;if(process.env.ZIBBY_VERBOSE==="true")return P.info;let t=process.env.LOG_LEVEL?.toLowerCase();return t&&t in P?P[t]:P.info}_shouldLog(t){return P[t]>=this._level}_formatMessage(t,e,r={}){let o=new Date().toISOString(),n=`${this._getPrefix(t)} ${e}`;return Object.keys(r).length>0&&(n+=z.dim(` ${JSON.stringify(r)}`)),n}_getPrefix(t){return{debug:z.gray("[DEBUG]"),info:z.cyan("[INFO]"),warn:z.yellow("[WARN]"),error:z.red("\u274C [ERROR]")}[t]||""}debug(t,e){this._shouldLog("debug")&&console.log(this._formatMessage("debug",t,e))}info(t,e){this._shouldLog("info")&&console.log(this._formatMessage("info",t,e))}warn(t,e){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",t,e))}error(t,e){this._shouldLog("error")&&console.error(this._formatMessage("error",t,e))}setLevel(t){t in P&&(this._level=P[t])}getLevel(){return Object.keys(P).find(t=>P[t]===this._level)}},s=new et;var Y={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 Z={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};var X=class i{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(t){if(!t)return null;this.buffer+=t;let e=this.buffer.split(`
|
|
2
|
+
`);this.buffer=e.pop()||"";let r="";for(let o of e)if(o.trim())try{let a=JSON.parse(o);this._emitToolCalls(a);let n=this.extractText(a);if(n){if(this.rawText&&n.startsWith(this.rawText)){let u=n.substring(this.rawText.length);this.rawText=n,r+=u}else(!this.rawText.includes(n)||n.length<20)&&(this.rawText+=n,r+=n);this.tryExtractResult(this.rawText)}else this.isValidResult(a)&&(this.rawText+=`${o}
|
|
3
|
+
`,r+=`${o}
|
|
4
|
+
`,this.extractedResult=a)}catch{if(o.includes('"text"')||o.includes('"content"')){let n=o.match(/"text"\s*:\s*"([^"]*)/),u=o.match(/"content"\s*:\s*"([^"]*)/),c=n?n[1]:u?u[1]:null;c&&!this.rawText.includes(c)&&(r+=c,this.rawText+=c)}}return r||null}flush(){if(!this.buffer.trim())return null;let t="";try{let e=JSON.parse(this.buffer);this._emitToolCalls(e);let r=this.extractText(e);r&&(this.rawText+=r,t+=r,this.tryExtractResult(r))}catch{this.rawText+=this.buffer,t+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",t||null}_emitToolCalls(t){if(!this.onToolCall)return;let e=(n,u)=>{if(!n)return;let c=`${n}:${JSON.stringify(u??{})}`;this._lastToolEmit!==c&&(this._lastToolEmit=c,this.onToolCall(n,u??void 0))},r=n=>{if(n!=null){if(typeof n=="object"&&!Array.isArray(n))return n;if(typeof n=="string")try{return JSON.parse(n)}catch{return}}};if(t.type==="tool_use"||t.type==="tool_call"){if(t.name){e(t.name,r(t.input??t.arguments));return}let n=t.tool_call;if(n&&typeof n=="object"&&!Array.isArray(n)){let u=Object.keys(n);if(u.length===1){let c=u[0],y=n[c],p=y&&typeof y=="object"?y.args??y.input??y:void 0;e(c,r(p))}return}return}if(Array.isArray(t.tool_calls)){for(let n of t.tool_calls)e(n.name,r(n.input??n.arguments));return}let o=t.message??t;if(Array.isArray(o?.tool_calls)){for(let n of o.tool_calls)e(n.name,r(n.input??n.arguments));return}let a=o?.content??t.content;if(Array.isArray(a))for(let n of a)(n.type==="tool_use"||n.type==="tool_call")&&n.name&&e(n.name,r(n.input??n.arguments))}extractText(t){if(t.type==="assistant"&&t.message?.content){let e=t.message.content;if(Array.isArray(e))return e.filter(r=>r.type==="text"&&r.text).map(r=>r.text).join("")}return t.type==="thinking"&&t.text||t.text?t.text:t.content&&typeof t.content=="string"?t.content:t.delta?t.delta:null}tryExtractResult(t){if(!t||typeof t!="string")return;let e=[],r=/```json\s*\n?([\s\S]*?)\n?```/g,o;for(;(o=r.exec(t))!==null;){let g=o[1].trim();try{JSON.parse(g),e.push({text:g,source:"markdown"})}catch{}}let a=0,n=0;for(;a<t.length&&(a=t.indexOf("{",a),a!==-1);){let g=0,f=a;for(let O=a;O<t.length;O++)if(t[O]==="{")g++;else if(t[O]==="}"&&(g--,g===0)){f=O,e.push({text:t.substring(a,f+1),source:"brace"}),n++;break}a=f+1}let u=this.extractedResult,c=u?JSON.stringify(u).length:0,y=0,p=-1;for(let g=0;g<e.length;g++){let f=e[g];try{let O=f.text.replace(/,(\s*[}\]])/g,"$1"),I=JSON.parse(O);this.isValidResult(I)&&(y++,c=JSON.stringify(I).length,u=I,p=g)}catch{}}u&&(this.extractedResult=u)}isValidResult(t){if(!t||typeof t!="object"||Array.isArray(t)||t.session_id||t.timestamp_ms||t.type||t.call_id||t.tool_call||t.result&&typeof t.result=="object"&&(t.result.success&&typeof t.result.success=="object"||t.result.error&&typeof t.result.error=="object")||t.args&&typeof t.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(t),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(t,e=null){let r=new i;r.zodSchema=e,r.processChunk(t),r.flush();let o=r.getResult();return!o&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",t?.length||0,"chars"),o}};import{zodToJsonSchema as yt}from"zod-to-json-schema";var q=class{static generateFileOutputInstructions(t,e){let r;typeof t?.parse=="function"?r=yt(t,{target:"openApi3"}):r=t;let o=this._buildExample(r);return`
|
|
5
5
|
\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
|
|
6
6
|
\u{1F6A8} MANDATORY: WRITE RESULT TO FILE \u{1F6A8}
|
|
7
7
|
\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
|
|
8
8
|
You MUST write your final result as pure JSON to this EXACT file path:
|
|
9
9
|
|
|
10
|
-
${
|
|
10
|
+
${e}
|
|
11
11
|
|
|
12
12
|
Use your file writing tool (WriteFile or ApplyPatch) to create this file.
|
|
13
13
|
DO NOT just output JSON to stdout. The file MUST exist when you finish.
|
|
@@ -21,29 +21,28 @@ JSON types (strict \u2014 validators reject wrong types):
|
|
|
21
21
|
- Use true/false without quotes for booleans.
|
|
22
22
|
- Use unquoted null where a field may be null.
|
|
23
23
|
|
|
24
|
-
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(t){if(!t)return{};let
|
|
24
|
+
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(t){if(!t)return{};let e=t.type;if(e==="object"&&t.properties){let r={};for(let[o,a]of Object.entries(t.properties))r[o]=this._buildExample(a);return r}if(e==="array"&&t.items)return[this._buildExample(t.items)];if(t.enum&&Array.isArray(t.enum)&&t.enum.length>0)return`<${t.enum.join("|")}>`;if(e==="string")return"<string>";if(e==="number"||e==="integer")return 0;if(e==="boolean")return!1;if(t.description)return`<${t.description}>`;if(t.nullable||t.oneOf||t.anyOf){let r=t.oneOf?.find(o=>o.type!=="null")||t.anyOf?.find(o=>o.type!=="null");return r?this._buildExample(r):null}return"<value>"}};var V=class i{constructor(t=""){this.userPrompt=t,this.systemInstructions=[],this.metadata={}}setUserPrompt(t){return this.userPrompt=t,this}appendUserPrompt(t){return this.userPrompt?this.userPrompt+=`
|
|
25
25
|
|
|
26
|
-
${t}`:this.userPrompt=t,this}addSkillHints(t){return t&&this.systemInstructions.push({type:"skill_hints",content:t,position:"prepend"}),this}addStructuredOutput(t,
|
|
26
|
+
${t}`:this.userPrompt=t,this}addSkillHints(t){return t&&this.systemInstructions.push({type:"skill_hints",content:t,position:"prepend"}),this}addStructuredOutput(t,e){if(t&&e){let r=q.generateFileOutputInstructions(t,e);this.systemInstructions.push({type:"structured_output",content:r,position:"append"}),this.metadata.structuredOutputPath=e}return this}addExtraInstructions(t){if(t?.trim()){let e=`\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
|
|
27
27
|
\u26A0\uFE0F PRIORITY OVERRIDE \u2014 THE FOLLOWING INSTRUCTIONS TAKE PRECEDENCE OVER ALL PREVIOUS CONTENT
|
|
28
28
|
\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
|
|
29
29
|
|
|
30
|
-
${t.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:
|
|
30
|
+
${t.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:e,position:"append"})}return this}addSkillFragments(t){return t&&t.length>0&&this.systemInstructions.push({type:"skill_fragments",content:t.join(`
|
|
31
31
|
|
|
32
|
-
`),position:"append"}),this}addSystemInstruction(t,
|
|
32
|
+
`),position:"append"}),this}addSystemInstruction(t,e="custom",r="append"){return t&&this.systemInstructions.push({type:e,content:t,position:r}),this}getUserPrompt(){return this.userPrompt}getSystemInstructions(){return this.systemInstructions}getMetadata(){return this.metadata}build(){let t=this.systemInstructions.filter(o=>o.position==="prepend").map(o=>o.content),e=this.systemInstructions.filter(o=>o.position==="append").map(o=>o.content);return[...t,this.userPrompt,...e].filter(Boolean).join(`
|
|
33
33
|
|
|
34
|
-
`)}getStats(){let t=this.userPrompt.length,
|
|
35
|
-
${
|
|
34
|
+
`)}getStats(){let t=this.userPrompt.length,e=this.build().length;return{userPromptLength:t,fullPromptLength:e,systemInstructionsLength:e-t,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(r=>r.type)}}clone(){let t=new i(this.userPrompt);return t.systemInstructions=[...this.systemInstructions],t.metadata={...this.metadata},t}};import Ot from"axios";import{homedir as Et}from"node:os";import{join as St}from"node:path";import{existsSync as _t,readFileSync as bt}from"node:fs";import{toJSONSchema as At}from"zod";function It(){if(process.env.OPENAI_PROXY_TOKEN)return s.debug("[Auth] Using OPENAI_PROXY_TOKEN (ECS execution)"),process.env.OPENAI_PROXY_TOKEN;if(process.env.ZIBBY_USER_TOKEN)return s.debug("[Auth] Using ZIBBY_USER_TOKEN (CI/CD PAT)"),process.env.ZIBBY_USER_TOKEN;try{let i=St(Et(),".zibby","config.json");if(_t(i)){let t=JSON.parse(bt(i,"utf-8"));if(t.sessionToken)return s.debug("[Auth] Using session token from zibby login"),t.sessionToken}}catch(i){s.debug(`[Auth] Could not read zibby login session: ${i.message}`)}return null}function xt(){return process.env.OPENAI_PROXY_URL?process.env.OPENAI_PROXY_URL.replace(/\/v1\/?$/,""):"https://api-prod.zibby.app/openai-proxy"}function J(i){if(!(typeof i!="object"||i===null)){if(Object.keys(i).length===0){i.type="object",i.additionalProperties=!0;return}if(i.type||(i.properties?i.type="object":i.items&&(i.type="array")),i.type==="object")if(i.properties){for(let[t,e]of Object.entries(i.properties))e.type==="object"&&e.additionalProperties&&e.additionalProperties!==!1&&(!e.properties||Object.keys(e.properties).length===0)&&(i.properties[t]={type:["object","null"]});i.additionalProperties=!1,i.required=Object.keys(i.properties),Object.values(i.properties).forEach(J)}else"additionalProperties"in i||(i.additionalProperties=!0);i.type==="array"&&i.items&&J(i.items),i.anyOf&&i.anyOf.forEach(J),i.oneOf&&i.oneOf.forEach(J),i.allOf&&i.allOf.forEach(J)}}async function ot(i,t){s.info("\u{1F527} [OpenAI Proxy] Formatting structured output...");let e=It();if(!e)throw new Error("Authentication required for structured output processing.\n Local development: Run `zibby login`\n CI/CD: Set ZIBBY_USER_TOKEN environment variable (Personal Access Token from UI settings)");let r=xt();s.info(`\u{1F517} Using OpenAI proxy: ${r}`);let o=At(t),a=o;if(o.$ref&&o.definitions){let p=o.$ref.split("/").pop();a=o.definitions[p]||o,s.debug(`Extracted schema from $ref: ${p}`)}delete a.$schema,J(a);let n=4e5,u=i;i.length>n&&(s.warn(`\u26A0\uFE0F [OpenAI Proxy] Raw text (${i.length} chars) exceeds limit, keeping last ${n} chars`),u=`... [truncated early content] ...
|
|
35
|
+
${i.slice(-n)}`);let c=`Extract and format the following information into structured JSON matching the schema.
|
|
36
36
|
|
|
37
37
|
RAW CONTENT:
|
|
38
38
|
${u}
|
|
39
39
|
|
|
40
|
-
Extract all relevant information and format it according to the schema. If any required fields are missing, do your best to infer them from the content.`,
|
|
40
|
+
Extract all relevant information and format it according to the schema. If any required fields are missing, do your best to infer them from the content.`,y={model:Y.OPENAI_POSTPROCESSING,messages:[{role:"user",content:c}],response_format:{type:"json_schema",json_schema:{name:"extract",schema:a,strict:!0}}};s.info(`\u{1F4E4} Sending to OpenAI proxy: model=${Y.OPENAI_POSTPROCESSING}, schema keys=${Object.keys(a.properties||{}).join(", ")}`),s.debug(` Schema size: ${JSON.stringify(a).length} chars`),s.debug(` Prompt size: ${c.length} chars`);try{let p={"Content-Type":"application/json"};process.env.OPENAI_PROXY_TOKEN?(p["x-proxy-token"]=e,p["x-execution-id"]=process.env.EXECUTION_ID||""):(p.Authorization=`Bearer ${e}`,p["x-api-key"]=process.env.ZIBBY_API_KEY||"",p["x-execution-id"]=process.env.EXECUTION_ID||"");let f=(await Ot.post(r,y,{headers:p,timeout:Z.OPENAI_REQUEST})).data?.choices?.[0]?.message?.content;if(!f)throw new Error("OpenAI proxy returned empty response");let O=JSON.parse(f);return s.info("\u2705 Successfully formatted with OpenAI proxy"),{structured:O,raw:i}}catch(p){if(p.response){let g=p.response.status,f=p.response.data;throw s.error(`\u274C OpenAI proxy request failed: ${g}`),s.error(` Status: ${g}`),s.error(` Response: ${JSON.stringify(f,null,2)}`),g===401||g===403?new Error(`Authentication failed for OpenAI proxy.
|
|
41
41
|
Run \`zibby login\` or set ZIBBY_USER_TOKEN environment variable.
|
|
42
|
-
Response: ${JSON.stringify(f)}`,{cause:p}):new Error(`Failed to format Cursor output: ${f?.error?.message||"Unknown error"}`,{cause:p})}throw
|
|
43
|
-
`)}function lt(n){let t=`${n}_POOL`,r=process.env[t];if(!r||typeof r!="string")return{picked:null,count:0,dispose:()=>{}};let e=r.split(/[,\n]+/).map(s=>s.trim()).filter(Boolean);if(e.length===0)return{picked:null,count:0,dispose:()=>{}};let o=e[Math.floor(Math.random()*e.length)],a=process.env[n];return process.env[n]=o,i.debug(`[auth-pool] ${n}: picked 1 of ${e.length} from pool (***${o.slice(-4)})`),{picked:o,count:e.length,dispose(){a===void 0?delete process.env[n]:process.env[n]=a}}}import{timeline as rt,Timeline as Te,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as we}from"@zibby/agent-workflow";import{copyFileSync as Ut,existsSync as nt,lstatSync as Mt,mkdirSync as at,rmSync as Dt,symlinkSync as Bt,unlinkSync as Ft}from"node:fs";import{join as L}from"node:path";import{homedir as Kt}from"node:os";import{randomBytes as Gt}from"node:crypto";var Jt=["cli-config.json","config.json","auth.json","argv.json"];function ut(n){return!(!n||typeof n!="string"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="1"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="true")}function ct(n){let t=L(n||process.cwd(),".zibby","tmp");at(t,{recursive:!0});let r=`${process.pid}-${Date.now()}-${Gt(4).toString("hex")}`,e=L(t,`cursor-agent-home-${r}`),o=L(e,".cursor");at(o,{recursive:!0});let a=Kt(),s=L(a,".cursor");if(nt(s))for(let u of Jt){let c=L(s,u);if(nt(c))try{Ut(c,L(o,u))}catch{}}if(process.platform==="darwin"){let u=L(a,"Library");if(nt(u))try{Bt(u,L(e,"Library"))}catch{}}return e}function pt(n){if(!(!n||typeof n!="string"))try{let t=L(n,"Library");try{Mt(t).isSymbolicLink()&&Ft(t)}catch{}Dt(n,{recursive:!0,force:!0})}catch{}}var Et=class extends zt{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(t){let r=[v(X(),".local","bin","cursor-agent"),v(X(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"];for(let e of r)try{if(e.startsWith("/")){ht(e,yt.X_OK);let o=B(`"${e}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(o&&o.length>0)return i.debug(`[Cursor] Found agent at: ${e} (version: ${o.trim().slice(0,50)})`),!0}else{let o=B(`which ${e}`,{encoding:"utf-8",timeout:2e3,stdio:"pipe"}).trim();if(!o)continue;let a=B(`${e} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(a&&a.length>0)return i.debug(`[Cursor] Found '${e}' in PATH at ${o} (version: ${a.trim().slice(0,50)})`),!0}}catch{continue}return i.warn("[Cursor] \u274C Cursor Agent CLI not found or not working. Run: agent --version"),!1}async invoke(t,r={}){let{workspace:e=process.cwd(),print:o=!1,schema:a=null,skills:s=null,sessionPath:u=null,nodeName:c=null,timeout:E=q.CURSOR_AGENT_DEFAULT,config:p={},signal:g=null}=r,f=p?.agent?.strictMode||!1,O=r.model??p?.agent?.cursor?.model??W.CURSOR,A=lt("CURSOR_API_KEY");try{i.debug(`[Cursor] Invoking (model: ${O}, timeout: ${E/1e3}s, skills: ${JSON.stringify(s)})`);let m=(this._setupMcpConfig(u,e,p,s,c)||{}).isolatedMcpHome??null,w=[v(X(),".local","bin","cursor-agent"),v(X(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"],U=null;for(let l of w)try{if(l.startsWith("/"))ht(l,yt.X_OK),B(`"${l}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!B(`which ${l}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");B(`${l} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}U=l,i.debug(`[Agent] Using binary: ${l}`);break}catch(d){i.debug(`[Agent] Binary '${l}' check failed: ${d.message}`);continue}if(!U)throw new Error(`Cursor Agent CLI not found or not working.
|
|
42
|
+
Response: ${JSON.stringify(f)}`,{cause:p}):new Error(`Failed to format Cursor output: ${f?.error?.message||"Unknown error"}`,{cause:p})}throw s.error(`\u274C OpenAI proxy request failed: ${p.message}`),new Error(`Failed to format output: ${p.message}`,{cause:p})}}function st(i){let t=`${i}_POOL`,e=process.env[t];if(!e||typeof e!="string")return{picked:null,count:0,dispose:()=>{}};let r=e.split(/[,\n]+/).map(n=>n.trim()).filter(Boolean);if(r.length===0)return{picked:null,count:0,dispose:()=>{}};let o=r[Math.floor(Math.random()*r.length)],a=process.env[i];return process.env[i]=o,s.debug(`[auth-pool] ${i}: picked 1 of ${r.length} from pool (***${o.slice(-4)})`),{picked:o,count:r.length,dispose(){a===void 0?delete process.env[i]:process.env[i]=a}}}import{timeline as rt,Timeline as ae,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as ue}from"@zibby/agent-workflow";import{copyFileSync as Tt,existsSync as nt,lstatSync as wt,mkdirSync as it,rmSync as $t,symlinkSync as vt,unlinkSync as Rt}from"node:fs";import{join as M}from"node:path";import{homedir as Pt}from"node:os";import{randomBytes as Ct}from"node:crypto";var Nt=["cli-config.json","config.json","auth.json","argv.json"];function lt(i){return!(!i||typeof i!="string"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="1"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="true")}function at(i){let t=M(i||process.cwd(),".zibby","tmp");it(t,{recursive:!0});let e=`${process.pid}-${Date.now()}-${Ct(4).toString("hex")}`,r=M(t,`cursor-agent-home-${e}`),o=M(r,".cursor");it(o,{recursive:!0});let a=Pt(),n=M(a,".cursor");if(nt(n))for(let u of Nt){let c=M(n,u);if(nt(c))try{Tt(c,M(o,u))}catch{}}if(process.platform==="darwin"){let u=M(a,"Library");if(nt(u))try{vt(u,M(r,"Library"))}catch{}}return r}function ut(i){if(!(!i||typeof i!="string"))try{let t=M(i,"Library");try{wt(t).isSymbolicLink()&&Rt(t)}catch{}$t(i,{recursive:!0,force:!0})}catch{}}var ht=class extends kt{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(t){let e=[$(j(),".local","bin","cursor-agent"),$(j(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"];for(let r of e)try{if(r.startsWith("/")){gt(r,mt.X_OK);let o=F(`"${r}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(o&&o.length>0)return s.debug(`[Cursor] Found agent at: ${r} (version: ${o.trim().slice(0,50)})`),!0}else{let o=F(`which ${r}`,{encoding:"utf-8",timeout:2e3,stdio:"pipe"}).trim();if(!o)continue;let a=F(`${r} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(a&&a.length>0)return s.debug(`[Cursor] Found '${r}' in PATH at ${o} (version: ${a.trim().slice(0,50)})`),!0}}catch{continue}return s.warn("[Cursor] \u274C Cursor Agent CLI not found or not working. Run: agent --version"),!1}async invoke(t,e={}){let{workspace:r=process.cwd(),print:o=!1,schema:a=null,skills:n=null,sessionPath:u=null,nodeName:c=null,timeout:y=Z.CURSOR_AGENT_DEFAULT,config:p={},signal:g=null}=e,f=p?.agent?.strictMode||!1,O=e.model??p?.agent?.cursor?.model??Y.CURSOR,I=st("CURSOR_API_KEY");try{s.debug(`[Cursor] Invoking (model: ${O}, timeout: ${y/1e3}s, skills: ${JSON.stringify(n)})`);let m=(this._setupMcpConfig(u,r,p,n,c)||{}).isolatedMcpHome??null,T=[$(j(),".local","bin","cursor-agent"),$(j(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","/Applications/Cursor.app/Contents/Resources/app/bin/cursor","agent","cursor-agent"],U=null;for(let h of T)try{if(h.startsWith("/"))gt(h,mt.X_OK),F(`"${h}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!F(`which ${h}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");F(`${h} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}U=h,s.debug(`[Agent] Using binary: ${h}`);break}catch(l){s.debug(`[Agent] Binary '${h}' check failed: ${l.message}`);continue}if(!U)throw new Error(`Cursor Agent CLI not found or not working.
|
|
44
43
|
|
|
45
44
|
Checked paths:
|
|
46
|
-
${
|
|
45
|
+
${T.map(h=>` - ${h}`).join(`
|
|
47
46
|
`)}
|
|
48
47
|
|
|
49
48
|
Install cursor-agent:
|
|
@@ -52,28 +51,28 @@ Install cursor-agent:
|
|
|
52
51
|
Then add to PATH:
|
|
53
52
|
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc
|
|
54
53
|
|
|
55
|
-
Test with: agent --version`);let
|
|
56
|
-
\u25C6 Model: ${O||"auto"}${
|
|
57
|
-
`);let
|
|
58
|
-
${
|
|
59
|
-
`)}catch{}let
|
|
60
|
-
`):
|
|
61
|
-
${
|
|
62
|
-
${JSON.stringify(
|
|
63
|
-
${
|
|
54
|
+
Test with: agent --version`);let w=new V(t),A=null;if(a){let h=`zibby-result-${Date.now()}.json`;A=$(r,".zibby","tmp",h);let l=$(r,".zibby","tmp");H(l)||dt(l,{recursive:!0}),w.addStructuredOutput(a,A)}let K=process.env.CURSOR_API_KEY,W=K?` | key: ***${K.slice(-4)}`:" | key: not set";console.log(`
|
|
55
|
+
\u25C6 Model: ${O||"auto"}${W}
|
|
56
|
+
`);let D=(await import("chalk")).default,E=w.getUserPrompt();console.log(`
|
|
57
|
+
${D.bold("Prompt sent to LLM:")}`),console.log(D.dim("\u2500".repeat(60))),console.log(D.dim(E)),console.log(D.dim("\u2500".repeat(60)));let B=w.build(),N=w.getStats(),k=["--print","--force","--approve-mcps","--output-format","stream-json","--stream-partial-output","--model",O||"auto"];if(process.env.CURSOR_API_KEY&&k.push("--api-key",process.env.CURSOR_API_KEY),k.push(B),s.debug(`[Agent] User prompt: ${N.userPromptLength} chars, System instructions: ${N.systemInstructionsLength} chars (${N.instructionCount} blocks), Full: ${N.fullPromptLength} chars, model: ${O||"auto"}`),s.debug(`[Agent] Workspace: ${r}`),process.env.LOG_LEVEL==="debug"||process.env.ZIBBY_LOG_CURSOR_CLI==="1")try{console.log(`\u{1F527} Cursor CLI --model ${O||"auto"} (from .zibby.config.js agent.cursor.model)
|
|
58
|
+
`)}catch{}let v,L=null;try{let h=u||(process.env.ZIBBY_SESSION_PATH?String(process.env.ZIBBY_SESSION_PATH).trim():null);v=await this._spawnWithStreaming(U,k,r,y,null,h,m,g)}catch(h){L=h}let R=v?.stdout||"";if(a){let h=typeof a.parse=="function",l=null,_=!!(A&&H(A));if(A&&s.info(`[Agent] Result file: ${_?"present":"missing"} at ${A}`),_)try{let d=ft(A,"utf-8").trim();l=JSON.parse(d),s.info(`[Agent] Parsed JSON from result file OK (${d.length} chars) \u2192 object ready for validation`),L&&s.debug("[Agent] Agent exited non-zero but result file was written \u2014 recovering")}catch(d){s.warn(`\u26A0\uFE0F [Agent] Result file exists on disk but is not valid JSON: ${d.message}`)}else if(L)s.warn(`[Agent] Result file missing at ${A} (agent process error \u2014 may still recover if strictMode repairs)`);else throw s.error(`\u274C [Agent] Result file was never created at ${A}`),new Error(`Agent did not write required result file at ${A}`);if(l&&h)try{let d=a.parse(l);return s.info("\u2705 [Agent] Zod validation passed for structured result file"),f&&s.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:R,structured:d}}catch(d){let x=d.issues?d.issues.map(b=>` - ${b.path.join(".")}: ${b.message}`).join(`
|
|
59
|
+
`):d.message?.slice(0,400);if(s.error(`\u274C [Agent] Zod validation FAILED - invalid output schema:
|
|
60
|
+
${x}`),s.error(`\u{1F4C4} [Agent] Invalid JSON written to file:
|
|
61
|
+
${JSON.stringify(l,null,2).slice(0,500)}`),!f)throw new Error(`Agent output failed schema validation:
|
|
62
|
+
${x}
|
|
64
63
|
|
|
65
64
|
The agent wrote invalid data that doesn't match the required outputSchema.
|
|
66
|
-
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:
|
|
67
|
-
`),
|
|
68
|
-
`;if(
|
|
69
|
-
`)){let
|
|
70
|
-
${f.slice(-2e3)}`),
|
|
71
|
-
`).filter(
|
|
72
|
-
`).filter(
|
|
65
|
+
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:d})}else{if(l)return s.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),f&&s.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:R,structured:l};_&&s.error("\u274C [Agent] Result file exists but produced no in-memory JSON (parse failed earlier)")}if(f&&!L){let d=v.parsedText,x=l?JSON.stringify(l):d;s.info(`[Agent] strictMode: calling OpenAI proxy to fix structured output (${x.length} chars in)`);try{let b=await ot(x,a);if(h){let G=a.parse(b.structured);return s.info("\u2705 [Agent] Proxy output passed Zod validation"),{raw:R,structured:G}}return{raw:R,...b}}catch(b){if(s.warn(`\u26A0\uFE0F [Agent] strictMode proxy failed: ${b.message}`),l)return s.warn("[Agent] Using agent's original result file as fallback"),{raw:R,structured:l}}}if(L)throw L;let S=_?l==null?"file existed but JSON.parse failed \u2014 see WARN log above":h?"JSON was valid but Zod validation failed \u2014 see WARN log above":"no structured object after read (unexpected)":"file never appeared (agent may not have run Write tool to the path above)";throw s.error(`\u274C [Agent] No validated structured output: ${S}`),s.error("\u{1F4A1} Tip: Set strictMode=true in .zibby.config.js for OpenAI proxy fallback"),new Error(`Agent did not produce a valid result file at ${A}. Enable strictMode for proxy fallback.`)}if(L)throw L;return this._extractFinalResult(R)||v?.parsedText||R}finally{I.dispose()}}_extractFinalResult(t){if(!t)return null;let e=t.split(`
|
|
66
|
+
`),r=null;for(let o of e){let a=o.trim();if(a)try{let n=JSON.parse(a);if(n.type==="assistant"&&n.message?.content){let u=n.message.content;if(Array.isArray(u)){let c=u.filter(y=>y.type==="text"&&y.text).map(y=>y.text).join("");c&&(r=c)}else typeof u=="string"&&u&&(r=u)}}catch{}}return r?.trim()||null}_setupMcpConfig(t,e,r,o=null,a=null){let n=r?.headless,u=$(j(),".cursor"),c=$(u,"mcp.json"),y={};if(H(c))try{y=JSON.parse(ft(c,"utf-8"))}catch{}let p=y.mcpServers||{},g=r?.paths?.output||Lt,f=$(e||process.cwd(),g,Mt),O=Array.isArray(o)?o.map(m=>ct(m)).filter(Boolean):[...Dt()].map(([,m])=>m),I=new Set;for(let m of O)typeof m.resolve=="function"&&(I.has(m.serverName)||(I.add(m.serverName),this._ensureSkillConfigured(p,m,t,f,a,n)));if(t){let m=ct("browser");m&&typeof m.resolve=="function"&&!I.has(m.serverName)&&this._ensureSkillConfigured(p,m,t,f,"execute_live",n)}if(Object.keys(p).length===0)return s.debug("[MCP] No MCP servers configured - agent will run without tool access"),{isolatedMcpHome:null};let C=`${JSON.stringify({mcpServers:p},null,2)}
|
|
67
|
+
`;if(lt(t)){let m=at(e||process.cwd()),T=$(m,".cursor","mcp.json");return pt(T,C,"utf8"),s.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${m} | servers: ${Object.keys(p).join(", ")}`),{isolatedMcpHome:m}}return H(u)||dt(u,{recursive:!0}),pt(c,C,"utf8"),s.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(p).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(t,e,r,o,a=null,n){let u=e.cursorKey||e.serverName,c=t[u]?u:t[e.serverName]?e.serverName:null;if(c&&r){let p=typeof e.resolve=="function"?e.resolve({sessionPath:r,nodeName:a,headless:n}):null;p?.args?t[c].args=p.args:t[c].args=(t[c].args||[]).map(O=>O.startsWith("--output-dir=")?`--output-dir=${r}`:O);let g=p?.env||{},f=e.sessionEnvKey?{[e.sessionEnvKey]:o}:{};t[c].env={...t[c].env||{},...g,...f},s.debug(`[MCP] Updated ${c} session \u2192 ${r}`);return}if(c)return;let y=e.resolve({sessionPath:r,nodeName:a,headless:n});y&&(t[u]={...y,...e.sessionEnvKey&&{env:{...y.env||{},[e.sessionEnvKey]:o}}},s.debug(`[MCP] Configured ${u}`))}_spawnWithStreaming(t,e,r,o,a=null,n=null,u=null,c=null){return new Promise((y,p)=>{let g=Date.now(),f="",O="",I=Date.now(),C=0,m=!1,T=null,U=!1,w=!1,A=null;if(n)try{A=$(Jt(String(n)),Ut)}catch{A=null}let K=!1,W=()=>{K||(K=!0,ut(u))},D={...process.env};u&&(D.HOME=u,process.platform==="win32"&&(D.USERPROFILE=u),s.debug(`[Agent] cursor-agent HOME=${u} (isolated MCP config)`));let E=Bt(t,e,{cwd:r,shell:!1,stdio:["pipe","pipe","pipe"],env:D,...c&&{signal:c}});s.debug(`[Agent] PID: ${E.pid}`);let B=null,N=()=>{m||w||(m=!0,T="aborted",s.warn("\u{1F6D1} Abort signal \u2014 terminating cursor-agent (SIGKILL in 5s if SIGTERM trapped)"),B=setTimeout(()=>{if(!w){s.warn("\u{1F6D1} SIGTERM not honored \u2014 sending SIGKILL");try{E.kill("SIGKILL")}catch{}}},5e3))};c&&(c.aborted?N():c.addEventListener("abort",N,{once:!0})),E.stdin.on("error",l=>{l.code!=="EPIPE"&&s.warn(`[Agent] stdin error: ${l.message}`)}),E.stdout.on("error",l=>{l.code!=="EPIPE"&&s.warn(`[Agent] stdout error: ${l.message}`)}),E.stderr.on("error",l=>{l.code!=="EPIPE"&&s.warn(`[Agent] stderr error: ${l.message}`)}),a?(E.stdin.write(a,l=>{l&&l.code!=="EPIPE"&&s.warn(`[Agent] Failed to write to stdin: ${l.message}`),E.stdin.end()}),s.debug(`[Agent] Prompt also piped to stdin (${a.length} chars)`)):E.stdin.end();let k=null;A&&(k=setInterval(()=>{if(!(m||w))try{if(H(A)){m=!0,T="aborted";try{Ft(A)}catch{}s.warn("\u{1F6D1} External stop requested \u2014 terminating Cursor agent (and MCP browser session)"),E.kill("SIGTERM"),setTimeout(()=>{E.killed||E.kill("SIGKILL")},2e3)}}catch{}},600));let v=new Set,L=new Date(g).toISOString().replace(/\.\d+Z$/,""),R=setInterval(()=>{let l=Math.round((Date.now()-g)/1e3),_=Math.round((Date.now()-I)/1e3),S=[];try{let x=Math.ceil(l/60)+1,b=F(`find "${r}" -type f -mmin -${x} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/target/*' 2>/dev/null | head -20`,{encoding:"utf-8",timeout:5e3}).trim();if(b)for(let G of b.split(`
|
|
68
|
+
`)){let tt=G.replace(`${r}/`,"");v.has(tt)||(v.add(tt),S.push(tt))}}catch{}let d="";S.length>0&&(d=` | \u{1F4C1} new: ${S.map(b=>b.split("/").pop()).join(", ")}`),v.size>0&&(d+=` | \u{1F4E6} total: ${v.size} files`),s.debug(`\u{1F493} [Agent] Running for ${l}s | ${C} lines output${d}`),C===0&&l>=30&&v.size===0&&(l<35&&s.warn(`\u26A0\uFE0F [Agent] No output after ${l}s \u2014 agent may be stuck. Check your CURSOR_API_KEY.`),l>=60&&(m=!0,T=T||"stall",s.error(`\u274C [Agent] No response after ${l}s \u2014 killing. Verify CURSOR_API_KEY is valid and agent CLI works: agent --version`),E.kill("SIGTERM"),setTimeout(()=>{E.killed||E.kill("SIGKILL")},3e3)))},3e4),Q=setTimeout(()=>{m=!0,T=T||"timeout";let l=Math.round((Date.now()-g)/1e3);s.error(`\u23F1\uFE0F [Agent] Timeout after ${l}s \u2014 killing process (PID: ${E.pid})`),f.trim()&&s.warn(`\u{1F4E4} [Agent] Partial output (${f.length} chars) before timeout:
|
|
69
|
+
${f.slice(-2e3)}`),E.kill("SIGTERM"),setTimeout(()=>{E.killed||E.kill("SIGKILL")},5e3)},o),h=new X;h.onToolCall=(l,_)=>{let S=l,d=_;if(l==="mcpToolCall"&&_?.name)S=_.name.replace(/^mcp_+[^_]+_+/,""),S.includes("-")&&S.split("-")[0]===S.split("-")[1]&&(S=S.split("-")[0]),d=_.args??_.input??_;else{if(l==="readToolCall"||l==="editToolCall"||l==="writeToolCall")return;(l.startsWith("mcp__")||l.includes("ToolCall"))&&(S=l.replace(/^mcp_+[^_]+_+/,"").replace(/ToolCall$/,""))}if(S.includes("memory")?rt.stepMemory(`Tool: ${S}`):rt.stepTool(`Tool: ${S}`),d!=null&&typeof d=="object"&&Object.keys(d).length>0&&!w){let b=JSON.stringify(d),G=b.length>100?`${b.substring(0,100)}...`:b;console.log(` Input: ${G}`)}},E.stdout.on("data",l=>{let _=l.toString();f+=_,I=Date.now(),U||(U=!0);let S=h.processChunk(_);S&&!w&&process.stdout.write(S);let d=_.split(`
|
|
70
|
+
`).filter(x=>x.trim());C+=d.length}),E.stderr.on("data",l=>{let _=l.toString();O+=_,I=Date.now(),U||(U=!0);let S=_.split(`
|
|
71
|
+
`).filter(d=>d.trim());for(let d of S)s.warn(`\u26A0\uFE0F [Agent stderr] ${d}`)}),E.on("close",(l,_)=>{if(w=!0,W(),clearTimeout(Q),clearInterval(R),k&&clearInterval(k),B&&clearTimeout(B),c&&!c.aborted)try{c.removeEventListener("abort",N)}catch{}h.flush();let S=Math.round((Date.now()-g)/1e3);if(s.debug(`[Agent] Exited: code=${l}, signal=${_}, elapsed=${S}s, output=${f.length} chars`),m){if(T==="aborted"){let b=new Error("Aborted via signal");b.name="AbortError",p(b);return}p(new Error(`Cursor Agent timed out after ${S}s (limit: ${o/1e3}s). ${C} lines produced. Last output ${Math.round((Date.now()-I)/1e3)}s ago. ${f.trim()?`
|
|
73
72
|
Partial output (last 500 chars):
|
|
74
73
|
${f.slice(-500)}`:"No output captured."}`));return}if(l!==0){p(new Error(`Cursor Agent failed: exit code ${l}, signal ${c}. ${O.trim()?`
|
|
75
74
|
Stderr: ${O.slice(-1e3)}`:""}${f.trim()?`
|
|
76
|
-
Stdout (last 500 chars): ${f.slice(-500)}`:""}`));return}let
|
|
75
|
+
Stdout (last 500 chars): ${f.slice(-500)}`:""}`));return}let d=h.getResult(),x=d?JSON.stringify(d,null,2):h.getRawText()||f||"";y({stdout:f||O||"",parsedText:x})}),E.on("error",l=>{if(W(),clearTimeout(Q),clearInterval(R),k&&clearInterval(k),B&&clearTimeout(B),c&&!c.aborted)try{c.removeEventListener("abort",N)}catch{}p(new Error(`Cursor Agent spawn error: ${l.message}
|
|
77
76
|
Binary: ${t}
|
|
78
77
|
This usually means the binary is not in PATH. Try:
|
|
79
|
-
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};export{
|
|
78
|
+
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};export{ht as CursorAgentStrategy};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
1
|
+
import{AgentStrategy as pt,getSkill as mt}from"@zibby/agent-workflow";import{execSync as dt,spawn as ht}from"node:child_process";import{zodToJsonSchema as gt}from"zod-to-json-schema";import{existsSync as et,mkdirSync as rt,readFileSync as st,rmSync as yt,writeFileSync as nt}from"node:fs";import{join as w}from"node:path";import P from"chalk";var g={debug:0,info:1,warn:2,error:3,silent:4},W=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return g.debug;if(process.env.ZIBBY_VERBOSE==="true")return g.info;let t=process.env.LOG_LEVEL?.toLowerCase();return t&&t in g?g[t]:g.info}_shouldLog(t){return g[t]>=this._level}_formatMessage(t,e,s={}){let n=new Date().toISOString(),r=`${this._getPrefix(t)} ${e}`;return Object.keys(s).length>0&&(r+=P.dim(` ${JSON.stringify(s)}`)),r}_getPrefix(t){return{debug:P.gray("[DEBUG]"),info:P.cyan("[INFO]"),warn:P.yellow("[WARN]"),error:P.red("\u274C [ERROR]")}[t]||""}debug(t,e){this._shouldLog("debug")&&console.log(this._formatMessage("debug",t,e))}info(t,e){this._shouldLog("info")&&console.log(this._formatMessage("info",t,e))}warn(t,e){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",t,e))}error(t,e){this._shouldLog("error")&&console.error(this._formatMessage("error",t,e))}setLevel(t){t in g&&(this._level=g[t])}getLevel(){return Object.keys(g).find(t=>g[t]===this._level)}},u=new W;var Q={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 tt={auto:"gemini-2.5-pro","gemini-2.5-pro":"gemini-2.5-pro","gemini-2.5-flash":"gemini-2.5-flash"},It={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};import{zodToJsonSchema as ft}from"zod-to-json-schema";var $=class{static generateFileOutputInstructions(t,e){let s;typeof t?.parse=="function"?s=ft(t,{target:"openApi3"}):s=t;let n=this._buildExample(s);return`
|
|
2
2
|
\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
|
|
3
3
|
\u{1F6A8} MANDATORY: WRITE RESULT TO FILE \u{1F6A8}
|
|
4
4
|
\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550
|
|
@@ -11,34 +11,33 @@ DO NOT just output JSON to stdout. The file MUST exist when you finish.
|
|
|
11
11
|
DO NOT skip this step. The workflow WILL FAIL if the file is missing.
|
|
12
12
|
|
|
13
13
|
Required JSON structure:
|
|
14
|
-
${JSON.stringify(
|
|
14
|
+
${JSON.stringify(n,null,2)}
|
|
15
15
|
|
|
16
16
|
JSON types (strict \u2014 validators reject wrong types):
|
|
17
17
|
- Use bare JSON numbers for numeric fields (e.g. 3000). Do NOT quote them as strings (wrong: "3000").
|
|
18
18
|
- Use true/false without quotes for booleans.
|
|
19
19
|
- Use unquoted null where a field may be null.
|
|
20
20
|
|
|
21
|
-
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(t){if(!t)return{};let e=t.type;if(e==="object"&&t.properties){let
|
|
21
|
+
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(t){if(!t)return{};let e=t.type;if(e==="object"&&t.properties){let s={};for(let[n,i]of Object.entries(t.properties))s[n]=this._buildExample(i);return s}if(e==="array"&&t.items)return[this._buildExample(t.items)];if(t.enum&&Array.isArray(t.enum)&&t.enum.length>0)return`<${t.enum.join("|")}>`;if(e==="string")return"<string>";if(e==="number"||e==="integer")return 0;if(e==="boolean")return!1;if(t.description)return`<${t.description}>`;if(t.nullable||t.oneOf||t.anyOf){let s=t.oneOf?.find(n=>n.type!=="null")||t.anyOf?.find(n=>n.type!=="null");return s?this._buildExample(s):null}return"<value>"}};var C=class c{constructor(t=""){this.userPrompt=t,this.systemInstructions=[],this.metadata={}}setUserPrompt(t){return this.userPrompt=t,this}appendUserPrompt(t){return this.userPrompt?this.userPrompt+=`
|
|
22
22
|
|
|
23
|
-
${t}`:this.userPrompt=t,this}addSkillHints(t){return t&&this.systemInstructions.push({type:"skill_hints",content:t,position:"prepend"}),this}addStructuredOutput(t,e){if(t&&e){let
|
|
23
|
+
${t}`:this.userPrompt=t,this}addSkillHints(t){return t&&this.systemInstructions.push({type:"skill_hints",content:t,position:"prepend"}),this}addStructuredOutput(t,e){if(t&&e){let s=$.generateFileOutputInstructions(t,e);this.systemInstructions.push({type:"structured_output",content:s,position:"append"}),this.metadata.structuredOutputPath=e}return this}addExtraInstructions(t){if(t?.trim()){let e=`\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
|
|
24
24
|
\u26A0\uFE0F PRIORITY OVERRIDE \u2014 THE FOLLOWING INSTRUCTIONS TAKE PRECEDENCE OVER ALL PREVIOUS CONTENT
|
|
25
25
|
\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501
|
|
26
26
|
|
|
27
27
|
${t.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:e,position:"append"})}return this}addSkillFragments(t){return t&&t.length>0&&this.systemInstructions.push({type:"skill_fragments",content:t.join(`
|
|
28
28
|
|
|
29
|
-
`),position:"append"}),this}addSystemInstruction(t,e="custom",
|
|
30
|
-
|
|
31
|
-
`)}getStats(){let t=this.userPrompt.length,e=this.build().length;return{userPromptLength:t,fullPromptLength:e,systemInstructionsLength:e-t,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(
|
|
32
|
-
`);this.buffer=e.pop()||"";let
|
|
33
|
-
`,
|
|
34
|
-
`,this.extractedResult=
|
|
35
|
-
|
|
36
|
-
${
|
|
37
|
-
${
|
|
38
|
-
|
|
39
|
-
`);let
|
|
40
|
-
${k.bold("Prompt sent to LLM:")}`),console.log(k.dim("\u2500".repeat(60))),console.log(k.dim(pt)),console.log(k.dim("\u2500".repeat(60)));let K=this._createGeminiConfigDir(s,R),I=["--output-format","json"];h&&h!=="auto"&&I.push("--model",h);let F=Object.keys(R);if(F.length>0){I.push("--approval-mode","yolo");for(let f of F)I.push("--allowed-mcp-server-names",f);u.info(`[Gemini] Enabling MCP servers: ${F.join(", ")}`)}else n&&n.length>0&&u.warn(`[Gemini] Skills requested but no MCP servers configured: ${n.join(", ")}`);I.push("-p",at);let A={...process.env,GEMINI_CLI_HOME:K};v?(A.GEMINI_API_KEY=v,delete A.GOOGLE_API_KEY):J&&(A.GOOGLE_API_KEY=J,delete A.GEMINI_API_KEY),u.debug(`[Gemini] Command: gemini ${I.slice(0,8).join(" ")}... (${I.length} total args)`),u.debug(`[Gemini] User prompt: ${$.userPromptLength} chars, System instructions: ${$.systemInstructionsLength} chars (${$.instructionCount} blocks), Full: ${$.fullPromptLength} chars`),u.debug(`[Gemini] Config home: ${K}`),u.debug(`[Gemini] GEMINI_CLI_HOME env: ${A.GEMINI_CLI_HOME}`);let Y="",P=null;try{Y=await new Promise((E,_)=>{let O=vt("gemini",I,{cwd:s,env:A,stdio:["ignore","pipe","pipe"],...p&&{signal:p}}),z="",X="",B=!1,N=null,H=!1,Z=setTimeout(()=>{try{O.kill("SIGTERM")}catch{}},a),L=()=>{H||B||(H=!0,N=setTimeout(()=>{if(!B)try{O.kill("SIGKILL")}catch{}},5e3))};p&&(p.aborted?L():p.addEventListener("abort",L,{once:!0})),O.stdout.on("data",S=>{z+=S.toString()}),O.stderr.on("data",S=>{X+=S.toString()}),O.on("error",S=>{if(clearTimeout(Z),N&&clearTimeout(N),p&&!p.aborted)try{p.removeEventListener("abort",L)}catch{}_(S)}),O.on("close",S=>{if(B=!0,clearTimeout(Z),N&&clearTimeout(N),p&&!p.aborted)try{p.removeEventListener("abort",L)}catch{}if(H){let Q=new Error("Aborted via signal");return Q.name="AbortError",_(Q)}if(S===0)return E(z.trim());_(new Error(`gemini failed with code ${S}: ${(X||z).trim()}`))})})}catch(f){P=f}finally{try{At(K,{recursive:!0,force:!0})}catch{}}let y=Gt(Y).trim();if(!o){if(P)throw P;return y}if(T){let f=st(T);if(u.info(`[Gemini] Result file: ${f?"present":"missing"} at ${T}`),f)try{let E=it(T,"utf-8").trim(),_=JSON.parse(E),O=U?o.parse(_):_;return u.info("[Gemini] Structured output recovered from result file"),{raw:y,structured:O}}catch(E){u.warn(`[Gemini] Result file parse/validation failed: ${E.message}`)}else P||u.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let w=null;if(o){let f=new D;f.zodSchema=o,f.processChunk(y),f.flush(),w=f.getResult()}if(u.info(`[Gemini] Raw stdout length: ${Y.length} chars`),u.info(`[Gemini] Extracted text length: ${y.length} chars`),u.info(`[Gemini] StreamParser result: ${w?"extracted":"null"}`),w||(y.length<2e3?u.info(`[Gemini] Raw text preview:
|
|
29
|
+
`),position:"append"}),this}addSystemInstruction(t,e="custom",s="append"){return t&&this.systemInstructions.push({type:e,content:t,position:s}),this}getUserPrompt(){return this.userPrompt}getSystemInstructions(){return this.systemInstructions}getMetadata(){return this.metadata}build(){let t=this.systemInstructions.filter(n=>n.position==="prepend").map(n=>n.content),e=this.systemInstructions.filter(n=>n.position==="append").map(n=>n.content);return[...t,this.userPrompt,...e].filter(Boolean).join(`
|
|
30
|
+
|
|
31
|
+
`)}getStats(){let t=this.userPrompt.length,e=this.build().length;return{userPromptLength:t,fullPromptLength:e,systemInstructionsLength:e-t,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(s=>s.type)}}clone(){let t=new c(this.userPrompt);return t.systemInstructions=[...this.systemInstructions],t.metadata={...this.metadata},t}};var J=class c{constructor(){this.buffer="",this.extractedResult=null,this.rawText="",this.zodSchema=null,this.lastOutputLength=0,this.onToolCall=null,this._lastToolEmit=null}processChunk(t){if(!t)return null;this.buffer+=t;let e=this.buffer.split(`
|
|
32
|
+
`);this.buffer=e.pop()||"";let s="";for(let n of e)if(n.trim())try{let i=JSON.parse(n);this._emitToolCalls(i);let r=this.extractText(i);if(r){if(this.rawText&&r.startsWith(this.rawText)){let o=r.substring(this.rawText.length);this.rawText=r,s+=o}else(!this.rawText.includes(r)||r.length<20)&&(this.rawText+=r,s+=r);this.tryExtractResult(this.rawText)}else this.isValidResult(i)&&(this.rawText+=`${n}
|
|
33
|
+
`,s+=`${n}
|
|
34
|
+
`,this.extractedResult=i)}catch{if(n.includes('"text"')||n.includes('"content"')){let r=n.match(/"text"\s*:\s*"([^"]*)/),o=n.match(/"content"\s*:\s*"([^"]*)/),l=r?r[1]:o?o[1]:null;l&&!this.rawText.includes(l)&&(s+=l,this.rawText+=l)}}return s||null}flush(){if(!this.buffer.trim())return null;let t="";try{let e=JSON.parse(this.buffer);this._emitToolCalls(e);let s=this.extractText(e);s&&(this.rawText+=s,t+=s,this.tryExtractResult(s))}catch{this.rawText+=this.buffer,t+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",t||null}_emitToolCalls(t){if(!this.onToolCall)return;let e=(r,o)=>{if(!r)return;let l=`${r}:${JSON.stringify(o??{})}`;this._lastToolEmit!==l&&(this._lastToolEmit=l,this.onToolCall(r,o??void 0))},s=r=>{if(r!=null){if(typeof r=="object"&&!Array.isArray(r))return r;if(typeof r=="string")try{return JSON.parse(r)}catch{return}}};if(t.type==="tool_use"||t.type==="tool_call"){if(t.name){e(t.name,s(t.input??t.arguments));return}let r=t.tool_call;if(r&&typeof r=="object"&&!Array.isArray(r)){let o=Object.keys(r);if(o.length===1){let l=o[0],a=r[l],f=a&&typeof a=="object"?a.args??a.input??a:void 0;e(l,s(f))}return}return}if(Array.isArray(t.tool_calls)){for(let r of t.tool_calls)e(r.name,s(r.input??r.arguments));return}let n=t.message??t;if(Array.isArray(n?.tool_calls)){for(let r of n.tool_calls)e(r.name,s(r.input??r.arguments));return}let i=n?.content??t.content;if(Array.isArray(i))for(let r of i)(r.type==="tool_use"||r.type==="tool_call")&&r.name&&e(r.name,s(r.input??r.arguments))}extractText(t){if(t.type==="assistant"&&t.message?.content){let e=t.message.content;if(Array.isArray(e))return e.filter(s=>s.type==="text"&&s.text).map(s=>s.text).join("")}return t.type==="thinking"&&t.text||t.text?t.text:t.content&&typeof t.content=="string"?t.content:t.delta?t.delta:null}tryExtractResult(t){if(!t||typeof t!="string")return;let e=[],s=/```json\s*\n?([\s\S]*?)\n?```/g,n;for(;(n=s.exec(t))!==null;){let d=n[1].trim();try{JSON.parse(d),e.push({text:d,source:"markdown"})}catch{}}let i=0,r=0;for(;i<t.length&&(i=t.indexOf("{",i),i!==-1);){let d=0,m=i;for(let h=i;h<t.length;h++)if(t[h]==="{")d++;else if(t[h]==="}"&&(d--,d===0)){m=h,e.push({text:t.substring(i,m+1),source:"brace"}),r++;break}i=m+1}let o=this.extractedResult,l=o?JSON.stringify(o).length:0,a=0,f=-1;for(let d=0;d<e.length;d++){let m=e[d];try{let h=m.text.replace(/,(\s*[}\]])/g,"$1"),T=JSON.parse(h);this.isValidResult(T)&&(a++,l=JSON.stringify(T).length,o=T,f=d)}catch{}}o&&(this.extractedResult=o)}isValidResult(t){if(!t||typeof t!="object"||Array.isArray(t)||t.session_id||t.timestamp_ms||t.type||t.call_id||t.tool_call||t.result&&typeof t.result=="object"&&(t.result.success&&typeof t.result.success=="object"||t.result.error&&typeof t.result.error=="object")||t.args&&typeof t.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(t),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(t,e=null){let s=new c;s.zodSchema=e,s.processChunk(t),s.flush();let n=s.getResult();return!n&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",t?.length||0,"chars"),n}};function H(c){let t=`${c}_POOL`,e=process.env[t];if(!e||typeof e!="string")return{picked:null,count:0,dispose:()=>{}};let s=e.split(/[,\n]+/).map(r=>r.trim()).filter(Boolean);if(s.length===0)return{picked:null,count:0,dispose:()=>{}};let n=s[Math.floor(Math.random()*s.length)],i=process.env[c];return process.env[c]=n,u.debug(`[auth-pool] ${c}: picked 1 of ${s.length} from pool (***${n.slice(-4)})`),{picked:n,count:s.length,dispose(){i===void 0?delete process.env[c]:process.env[c]=i}}}function Et(c){if(!c)return null;let t=String(c),e=t.match(/```(?:json)?\s*([\s\S]*?)```/i);if(e?.[1])try{return JSON.parse(e[1].trim())}catch{}let s=t.indexOf("{");if(s<0)return null;let n=0,i=!1,r=!1,o=-1;for(let l=s;l<t.length;l++){let a=t[l];if(i){r?r=!1:a==="\\"?r=!0:a==='"'&&(i=!1);continue}if(a==='"'){i=!0;continue}if(a==="{"){n===0&&(o=l),n+=1;continue}if(a==="}"){if(n===0)continue;if(n-=1,n===0&&o>=0){let f=t.slice(o,l+1);try{return JSON.parse(f)}catch{o=-1}}}}return null}function _t(c){let t=String(c||"").trim();if(!t)return null;try{return JSON.parse(t)}catch{return Et(t)}}function Ot(c){try{let t=JSON.parse(c);if(typeof t=="string")return t;if(typeof t?.response=="string")return t.response;if(typeof t?.text=="string")return t.text;if(typeof t?.output=="string")return t.output;if(Array.isArray(t?.candidates)&&t.candidates.length>0){let e=t.candidates[0];if(typeof e?.content=="string")return e.content;if(Array.isArray(e?.content?.parts)){let s=e.content.parts.map(n=>typeof n?.text=="string"?n.text:"").join("");if(s.trim())return s}}}catch{}return c}var it=class extends pt{constructor(){super("gemini","Gemini (Google)",70)}canHandle(t){if(!!!(process.env.GEMINI_API_KEY||process.env.GEMINI_API_KEY_POOL||process.env.GOOGLE_API_KEY||process.env.GOOGLE_API_KEY_POOL))return u.debug("GeminiAgentStrategy: GEMINI_API_KEY or GOOGLE_API_KEY not set"),!1;try{return dt("gemini --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return u.warn("[Gemini] gemini CLI not found. Install: npm install -g @google/gemini-cli"),!1}}async invoke(t,e={}){let{model:s,workspace:n=process.cwd(),schema:i=null,skills:r=null,sessionPath:o=null,nodeName:l=null,timeout:a=600*1e3,signal:f=null}=e,d=[H("GEMINI_API_KEY"),H("GOOGLE_API_KEY")];try{let m=s;(!m||m==="auto")&&(m=Q.GEMINI);let h=tt[m]||m,T=String(process.env.GEMINI_API_KEY||"").trim(),D=String(process.env.GOOGLE_API_KEY||"").trim(),R=this._resolveSkillsToMcp(r,{sessionPath:o,workspace:n,nodeName:l}),ot=Object.keys(R).length>0,v=new C(t),U=i&&typeof i.parse=="function",b=null;if(i){let p;try{let E=U?gt(i,{target:"openAi"}):i;p=JSON.stringify(E,null,2)}catch{p="{}"}if(ot){v.addSystemInstruction(`Write valid JSON that matches this schema:
|
|
35
|
+
${p}`,"schema_instruction","append");let E=`zibby-result-${Date.now()}.json`,_=w(n,".zibby","tmp");b=w(_,E),rt(_,{recursive:!0}),v.addStructuredOutput(i,b)}else v.addSystemInstruction(`Return ONLY valid JSON (no markdown, no commentary) that matches this schema:
|
|
36
|
+
${p}`,"json_instruction","append")}let lt=v.build(),ut=v.getUserPrompt(),M=v.getStats(),q=String(process.env.GEMINI_API_KEY||process.env.GOOGLE_API_KEY||"").trim(),ct=q?` | key: ***${q.slice(-4)}`:" | key: not set";console.log(`
|
|
37
|
+
\u25C6 Model: ${h||"auto"}${ct}
|
|
38
|
+
`);let L=(await import("chalk")).default;console.log(`
|
|
39
|
+
${L.bold("Prompt sent to LLM:")}`),console.log(L.dim("\u2500".repeat(60))),console.log(L.dim(ut)),console.log(L.dim("\u2500".repeat(60)));let K=this._createGeminiConfigDir(n,R),x=["--output-format","json"];h&&h!=="auto"&&x.push("--model",h);let Y=Object.keys(R);if(Y.length>0){x.push("--approval-mode","yolo");for(let p of Y)x.push("--allowed-mcp-server-names",p);u.info(`[Gemini] Enabling MCP servers: ${Y.join(", ")}`)}else r&&r.length>0&&u.warn(`[Gemini] Skills requested but no MCP servers configured: ${r.join(", ")}`);x.push("-p",lt);let A={...process.env,GEMINI_CLI_HOME:K};T?(A.GEMINI_API_KEY=T,delete A.GOOGLE_API_KEY):D&&(A.GOOGLE_API_KEY=D,delete A.GEMINI_API_KEY),u.debug(`[Gemini] Command: gemini ${x.slice(0,8).join(" ")}... (${x.length} total args)`),u.debug(`[Gemini] User prompt: ${M.userPromptLength} chars, System instructions: ${M.systemInstructionsLength} chars (${M.instructionCount} blocks), Full: ${M.fullPromptLength} chars`),u.debug(`[Gemini] Config home: ${K}`),u.debug(`[Gemini] GEMINI_CLI_HOME env: ${A.GEMINI_CLI_HOME}`);let F="",N=null;try{F=await new Promise((E,_)=>{let O=ht("gemini",x,{cwd:n,env:A,stdio:["ignore","pipe","pipe"],...f&&{signal:f}}),z="",X="",B=!1,G=null,V=!1,Z=setTimeout(()=>{try{O.kill("SIGTERM")}catch{}},a),k=()=>{V||B||(V=!0,G=setTimeout(()=>{if(!B)try{O.kill("SIGKILL")}catch{}},5e3))};f&&(f.aborted?k():f.addEventListener("abort",k,{once:!0})),O.stdout.on("data",S=>{z+=S.toString()}),O.stderr.on("data",S=>{X+=S.toString()}),O.on("error",S=>{if(clearTimeout(Z),G&&clearTimeout(G),f&&!f.aborted)try{f.removeEventListener("abort",k)}catch{}_(S)}),O.on("close",S=>{if(B=!0,clearTimeout(Z),G&&clearTimeout(G),f&&!f.aborted)try{f.removeEventListener("abort",k)}catch{}if(V){let j=new Error("Aborted via signal");return j.name="AbortError",_(j)}if(S===0)return E(z.trim());_(new Error(`gemini failed with code ${S}: ${(X||z).trim()}`))})})}catch(p){N=p}finally{try{yt(K,{recursive:!0,force:!0})}catch{}}let y=Ot(F).trim();if(!i){if(N)throw N;return y}if(b){let p=et(b);if(u.info(`[Gemini] Result file: ${p?"present":"missing"} at ${b}`),p)try{let E=st(b,"utf-8").trim(),_=JSON.parse(E),O=U?i.parse(_):_;return u.info("[Gemini] Structured output recovered from result file"),{raw:y,structured:O}}catch(E){u.warn(`[Gemini] Result file parse/validation failed: ${E.message}`)}else N||u.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let I=null;if(i){let p=new J;p.zodSchema=i,p.processChunk(y),p.flush(),I=p.getResult()}if(u.info(`[Gemini] Raw stdout length: ${F.length} chars`),u.info(`[Gemini] Extracted text length: ${y.length} chars`),u.info(`[Gemini] StreamParser result: ${I?"extracted":"null"}`),I||(y.length<2e3?u.info(`[Gemini] Raw text preview:
|
|
41
40
|
${y}`):u.info(`[Gemini] Raw text preview (first 1000 chars):
|
|
42
|
-
${y.slice(0,1e3)}`),
|
|
43
|
-
`,"utf-8");let
|
|
44
|
-
`,"utf-8")}catch{}return u.debug(`[Gemini] Created isolated config with ${Object.keys(a.mcpServers||{}).length} MCP servers`),u.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(a.mcpServers||{}),null,2)}`),
|
|
41
|
+
${y.slice(0,1e3)}`),I=_t(y)),!I)throw N||(u.error("[Gemini] Failed to extract valid JSON from output"),u.error("\u{1F4A1} Tip: Set strictMode=true in .zibby.config.js for OpenAI proxy fallback"),new Error("Gemini did not return valid JSON for structured output. Enable strictMode for proxy fallback."));let at=U?i.parse(I):I;return{raw:y,structured:at}}finally{for(let m of d)m.dispose()}}_resolveSkillsToMcp(t,e={}){if(!Array.isArray(t)||t.length===0)return{};let s={};for(let n of t){let i=mt(n);if(!i||typeof i.resolve!="function")continue;let r=i.resolve(e);if(!r)continue;let o=i.cursorKey||i.serverName||n,l={command:r.command};r.args?.length&&(l.args=r.args),r.env&&Object.keys(r.env).length>0&&(l.env=r.env),r.cwd&&(l.cwd=r.cwd),s[o]=l}return s}_createGeminiConfigDir(t,e){let s=`${Date.now()}-${Math.random().toString(16).slice(2,10)}`,n=w(t||process.cwd(),".zibby","tmp",`gemini-home-${s}`),i=w(n,".gemini");rt(i,{recursive:!0});let r=w(i,"settings.json"),o={},l=w(process.env.HOME||"",".gemini","settings.json");if(et(l))try{o=JSON.parse(st(l,"utf-8"))}catch{o={}}let a={...o,mcpServers:{...o.mcpServers&&typeof o.mcpServers=="object"?o.mcpServers:{},...e||{}}};nt(r,`${JSON.stringify(a,null,2)}
|
|
42
|
+
`,"utf-8");let f=w(t||process.cwd(),".zibby","tmp","gemini-settings-debug.json");try{nt(f,`${JSON.stringify(a,null,2)}
|
|
43
|
+
`,"utf-8")}catch{}return u.debug(`[Gemini] Created isolated config with ${Object.keys(a.mcpServers||{}).length} MCP servers`),u.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(a.mcpServers||{}),null,2)}`),n}};export{it as GeminiAgentStrategy};
|