@zibby/core 0.5.5 → 0.5.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/constants.js +1 -1
- package/dist/index.js +95 -95
- package/dist/models.js +1 -0
- package/dist/package.json +2 -1
- package/dist/register-built-in-strategies.js +51 -51
- package/dist/strategies/assistant-strategy.js +9 -9
- package/dist/strategies/claude-strategy.js +2 -2
- package/dist/strategies/codex-strategy.js +4 -4
- package/dist/strategies/cursor-strategy.js +32 -32
- package/dist/strategies/gemini-strategy.js +22 -22
- package/dist/strategies/index.js +55 -55
- package/dist/strategies/utils/openai-proxy-formatter.js +5 -5
- package/package.json +2 -1
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
2
|
-
`);this.buffer=
|
|
1
|
+
import{AgentStrategy as Me,DEFAULT_OUTPUT_BASE as Ue,SESSION_INFO_FILE as De,STOP_REQUEST_FILE as Fe,getAllSkills as Ge,getSkill as de}from"@zibby/agent-workflow";import{spawn as Be,execSync as G}from"node:child_process";import{writeFileSync as pe,readFileSync as fe,mkdirSync as me,existsSync as Y,accessSync as ge,constants as he,unlinkSync as Je}from"node:fs";import{join as w,resolve as Ke}from"node:path";import{homedir as H}from"node:os";import z from"chalk";var C={debug:0,info:1,warn:2,error:3,silent:4},re=class{constructor(){this._level=this._getLogLevel()}_getLogLevel(){if(process.env.ZIBBY_DEBUG==="true")return C.debug;if(process.env.ZIBBY_VERBOSE==="true")return C.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in C?C[e]:C.info}_shouldLog(e){return C[e]>=this._level}_formatMessage(e,t,r={}){let o=new Date().toISOString(),n=`${this._getPrefix(e)} ${t}`;return Object.keys(r).length>0&&(n+=z.dim(` ${JSON.stringify(r)}`)),n}_getPrefix(e){return{debug:z.gray("[DEBUG]"),info:z.cyan("[INFO]"),warn:z.yellow("[WARN]"),error:z.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in C&&(this._level=C[e])}getLevel(){return Object.keys(C).find(e=>C[e]===this._level)}},s=new re;var Oe=[{alias:"auto",canonicalId:"claude-sonnet-4-6",vendor:"claude",label:"Claude \xB7 Sonnet 4.6",family:"claude-sonnet-4",pickerVisible:!0,isDefault:!0},{alias:"opus-4.8",canonicalId:"claude-opus-4-8",vendor:"claude",label:"Claude \xB7 Opus 4.8",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"sonnet-4.8",canonicalId:"claude-sonnet-4-8",vendor:"claude",label:"Claude \xB7 Sonnet 4.8",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-8",canonicalId:"claude-sonnet-4-8",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"opus-4.7",canonicalId:"claude-opus-4-7",vendor:"claude",label:"Claude \xB7 Opus 4.7",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"sonnet-4.7",canonicalId:"claude-sonnet-4-7",vendor:"claude",label:"Claude \xB7 Sonnet 4.7",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-7",canonicalId:"claude-sonnet-4-7",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"sonnet-4.6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"opus-4.6",canonicalId:"claude-opus-4-6",vendor:"claude",label:"Claude \xB7 Opus 4.6",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"sonnet-4.5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",label:"Claude \xB7 Sonnet 4.5",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"opus-4.5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",label:"Claude \xB7 Opus 4.5",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"haiku-4.5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",label:"Claude \xB7 Haiku 4.5",family:"claude-haiku-4"},{alias:"haiku-4-5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"claude-sonnet-4-8",canonicalId:"claude-sonnet-4-8",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"claude-opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"claude-sonnet-4-7",canonicalId:"claude-sonnet-4-7",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"claude-sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"claude-opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"claude-sonnet-4-5-20250929",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"claude-opus-4-5-20251101",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"claude-haiku-4-5-20251001",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-20250514",canonicalId:"claude-opus-4-20250514",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"auto",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",isDefault:!0},{alias:"o4-mini",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",pickerVisible:!0},{alias:"o3",canonicalId:"o3",vendor:"codex",family:"o3"},{alias:"o3-mini",canonicalId:"o3-mini",vendor:"codex",family:"o3-mini"},{alias:"codex-mini",canonicalId:"codex-mini-latest",vendor:"codex",family:"codex-mini"},{alias:"gpt-4o",canonicalId:"gpt-4o",vendor:"codex",label:"Codex \xB7 GPT-4o",family:"gpt-4o",pickerVisible:!0},{alias:"gpt-4o-mini",canonicalId:"gpt-4o-mini",vendor:"codex",label:"Codex \xB7 GPT-4o mini",family:"gpt-4o-mini",pickerVisible:!0},{alias:"gpt-5.2-codex",canonicalId:"gpt-5.2-codex",vendor:"codex",label:"Codex \xB7 GPT-5.2",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.2",canonicalId:"gpt-5.2",vendor:"codex",label:"Codex \xB7 GPT-5.2 base",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3",canonicalId:"gpt-5.3",vendor:"codex",label:"Codex \xB7 GPT-5.3",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3-codex",canonicalId:"gpt-5.3-codex",vendor:"codex",family:"gpt-5"},{alias:"gpt-5.4",canonicalId:"gpt-5.4",vendor:"codex",label:"Codex \xB7 GPT-5.4",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.5",canonicalId:"gpt-5.5",vendor:"codex",label:"Codex \xB7 GPT-5.5",family:"gpt-5",pickerVisible:!0},{alias:"auto",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",isDefault:!0},{alias:"gemini-3-pro",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",pickerVisible:!0},{alias:"gemini-3-flash",canonicalId:"gemini-3-flash",vendor:"gemini",label:"Gemini \xB7 3 Flash",family:"gemini-3",pickerVisible:!0},{alias:"gemini-2.5-pro",canonicalId:"gemini-2.5-pro",vendor:"gemini",label:"Gemini \xB7 2.5 Pro",family:"gemini-2.5",pickerVisible:!0},{alias:"gemini-2.5-flash",canonicalId:"gemini-2.5-flash",vendor:"gemini",label:"Gemini \xB7 2.5 Flash",family:"gemini-2.5",pickerVisible:!0}];function W(i){let e={};for(let t of Oe)t.vendor===i&&(e[t.alias]=t.canonicalId);return e}var V={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var je=W("claude"),We=W("codex"),Ze=W("gemini"),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(e){if(!e)return null;this.buffer+=e;let t=this.buffer.split(`
|
|
2
|
+
`);this.buffer=t.pop()||"";let r="";for(let o of t)if(o.trim())try{let l=JSON.parse(o);this._emitToolCalls(l);let n=this.extractText(l);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(l)&&(this.rawText+=`${o}
|
|
3
3
|
`,r+=`${o}
|
|
4
|
-
`,this.extractedResult=
|
|
4
|
+
`,this.extractedResult=l)}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 e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let r=this.extractText(t);r&&(this.rawText+=r,e+=r,this.tryExtractResult(r))}catch{this.rawText+=this.buffer,e+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",e||null}_emitToolCalls(e){if(!this.onToolCall)return;let t=(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(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,r(e.input??e.arguments));return}let n=e.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],d=y&&typeof y=="object"?y.args??y.input??y:void 0;t(c,r(d))}return}return}if(Array.isArray(e.tool_calls)){for(let n of e.tool_calls)t(n.name,r(n.input??n.arguments));return}let o=e.message??e;if(Array.isArray(o?.tool_calls)){for(let n of o.tool_calls)t(n.name,r(n.input??n.arguments));return}let l=o?.content??e.content;if(Array.isArray(l))for(let n of l)(n.type==="tool_use"||n.type==="tool_call")&&n.name&&t(n.name,r(n.input??n.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(r=>r.type==="text"&&r.text).map(r=>r.text).join("")}return e.type==="thinking"&&e.text||e.text?e.text:e.content&&typeof e.content=="string"?e.content:e.delta?e.delta:null}tryExtractResult(e){if(!e||typeof e!="string")return;let t=[],r=/```json\s*\n?([\s\S]*?)\n?```/g,o;for(;(o=r.exec(e))!==null;){let m=o[1].trim();try{JSON.parse(m),t.push({text:m,source:"markdown"})}catch{}}let l=0,n=0;for(;l<e.length&&(l=e.indexOf("{",l),l!==-1);){let m=0,p=l;for(let O=l;O<e.length;O++)if(e[O]==="{")m++;else if(e[O]==="}"&&(m--,m===0)){p=O,t.push({text:e.substring(l,p+1),source:"brace"}),n++;break}l=p+1}let u=this.extractedResult,c=u?JSON.stringify(u).length:0,y=0,d=-1;for(let m=0;m<t.length;m++){let p=t[m];try{let O=p.text.replace(/,(\s*[}\]])/g,"$1"),x=JSON.parse(O);this.isValidResult(x)&&(y++,c=JSON.stringify(x).length,u=x,d=m)}catch{}}u&&(this.extractedResult=u)}isValidResult(e){if(!e||typeof e!="object"||Array.isArray(e)||e.session_id||e.timestamp_ms||e.type||e.call_id||e.tool_call||e.result&&typeof e.result=="object"&&(e.result.success&&typeof e.result.success=="object"||e.result.error&&typeof e.result.error=="object")||e.args&&typeof e.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(e),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(e,t=null){let r=new i;r.zodSchema=t,r.processChunk(e),r.flush();let o=r.getResult();return!o&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),o}};import{zodToJsonSchema as be}from"zod-to-json-schema";var q=class{static generateFileOutputInstructions(e,t){let r;typeof e?.parse=="function"?r=be(e,{target:"openApi3"}):r=e;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
|
+
${t}
|
|
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,25 +21,25 @@ 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(
|
|
24
|
+
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(e){if(!e)return{};let t=e.type;if(t==="object"&&e.properties){let r={};for(let[o,l]of Object.entries(e.properties))r[o]=this._buildExample(l);return r}if(t==="array"&&e.items)return[this._buildExample(e.items)];if(e.enum&&Array.isArray(e.enum)&&e.enum.length>0)return`<${e.enum.join("|")}>`;if(t==="string")return"<string>";if(t==="number"||t==="integer")return 0;if(t==="boolean")return!1;if(e.description)return`<${e.description}>`;if(e.nullable||e.oneOf||e.anyOf){let r=e.oneOf?.find(o=>o.type!=="null")||e.anyOf?.find(o=>o.type!=="null");return r?this._buildExample(r):null}return"<value>"}};var Q=class i{constructor(e=""){this.userPrompt=e,this.systemInstructions=[],this.metadata={}}setUserPrompt(e){return this.userPrompt=e,this}appendUserPrompt(e){return this.userPrompt?this.userPrompt+=`
|
|
25
25
|
|
|
26
|
-
${
|
|
26
|
+
${e}`:this.userPrompt=e,this}addSkillHints(e){return e&&this.systemInstructions.push({type:"skill_hints",content:e,position:"prepend"}),this}addStructuredOutput(e,t){if(e&&t){let r=q.generateFileOutputInstructions(e,t);this.systemInstructions.push({type:"structured_output",content:r,position:"append"}),this.metadata.structuredOutputPath=t}return this}addExtraInstructions(e){if(e?.trim()){let t=`\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
|
-
${
|
|
30
|
+
${e.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:t,position:"append"})}return this}addSkillFragments(e){return e&&e.length>0&&this.systemInstructions.push({type:"skill_fragments",content:e.join(`
|
|
31
31
|
|
|
32
|
-
`),position:"append"}),this}addSystemInstruction(t
|
|
32
|
+
`),position:"append"}),this}addSystemInstruction(e,t="custom",r="append"){return e&&this.systemInstructions.push({type:t,content:e,position:r}),this}getUserPrompt(){return this.userPrompt}getSystemInstructions(){return this.systemInstructions}getMetadata(){return this.metadata}build(){let e=this.systemInstructions.filter(o=>o.position==="prepend").map(o=>o.content),t=this.systemInstructions.filter(o=>o.position==="append").map(o=>o.content);return[...e,this.userPrompt,...t].filter(Boolean).join(`
|
|
33
33
|
|
|
34
|
-
`)}getStats(){let
|
|
34
|
+
`)}getStats(){let e=this.userPrompt.length,t=this.build().length;return{userPromptLength:e,fullPromptLength:t,systemInstructionsLength:t-e,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(r=>r.type)}}clone(){let e=new i(this.userPrompt);return e.systemInstructions=[...this.systemInstructions],e.metadata={...this.metadata},e}};import Ie from"axios";import{homedir as Ee}from"node:os";import{join as ve}from"node:path";import{existsSync as Se,readFileSync as xe}from"node:fs";import{toJSONSchema as _e}from"zod";function Te(){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=ve(Ee(),".zibby","config.json");if(Se(i)){let e=JSON.parse(xe(i,"utf-8"));if(e.sessionToken)return s.debug("[Auth] Using session token from zibby login"),e.sessionToken}}catch(i){s.debug(`[Auth] Could not read zibby login session: ${i.message}`)}return null}function Ae(){return process.env.OPENAI_PROXY_URL?process.env.OPENAI_PROXY_URL.replace(/\/v1\/?$/,""):"https://api-prod.zibby.app/openai-proxy"}function B(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[e,t]of Object.entries(i.properties))t.type==="object"&&t.additionalProperties&&t.additionalProperties!==!1&&(!t.properties||Object.keys(t.properties).length===0)&&(i.properties[e]={type:["object","null"]});i.additionalProperties=!1,i.required=Object.keys(i.properties),Object.values(i.properties).forEach(B)}else"additionalProperties"in i||(i.additionalProperties=!0);i.type==="array"&&i.items&&B(i.items),i.anyOf&&i.anyOf.forEach(B),i.oneOf&&i.oneOf.forEach(B),i.allOf&&i.allOf.forEach(B)}}async function se(i,e){s.info("\u{1F527} [OpenAI Proxy] Formatting structured output...");let t=Te();if(!t)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=Ae();s.info(`\u{1F517} Using OpenAI proxy: ${r}`);let o=_e(e),l=o;if(o.$ref&&o.definitions){let d=o.$ref.split("/").pop();l=o.definitions[d]||o,s.debug(`Extracted schema from $ref: ${d}`)}delete l.$schema,B(l);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
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.`,y={model:
|
|
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:V.OPENAI_POSTPROCESSING,messages:[{role:"user",content:c}],response_format:{type:"json_schema",json_schema:{name:"extract",schema:l,strict:!0}}};s.info(`\u{1F4E4} Sending to OpenAI proxy: model=${V.OPENAI_POSTPROCESSING}, schema keys=${Object.keys(l.properties||{}).join(", ")}`),s.debug(` Schema size: ${JSON.stringify(l).length} chars`),s.debug(` Prompt size: ${c.length} chars`);try{let d={"Content-Type":"application/json"};process.env.OPENAI_PROXY_TOKEN?(d["x-proxy-token"]=t,d["x-execution-id"]=process.env.EXECUTION_ID||""):(d.Authorization=`Bearer ${t}`,d["x-api-key"]=process.env.ZIBBY_API_KEY||"",d["x-execution-id"]=process.env.EXECUTION_ID||"");let p=(await Ie.post(r,y,{headers:d,timeout:Z.OPENAI_REQUEST})).data?.choices?.[0]?.message?.content;if(!p)throw new Error("OpenAI proxy returned empty response");let O=JSON.parse(p);return s.info("\u2705 Successfully formatted with OpenAI proxy"),{structured:O,raw:i}}catch(d){if(d.response){let m=d.response.status,p=d.response.data;throw s.error(`\u274C OpenAI proxy request failed: ${m}`),s.error(` Status: ${m}`),s.error(` Response: ${JSON.stringify(p,null,2)}`),m===401||m===403?new Error(`Authentication failed for OpenAI proxy.
|
|
41
41
|
Run \`zibby login\` or set ZIBBY_USER_TOKEN environment variable.
|
|
42
|
-
Response: ${JSON.stringify(
|
|
42
|
+
Response: ${JSON.stringify(p)}`,{cause:d}):new Error(`Failed to format Cursor output: ${p?.error?.message||"Unknown error"}`,{cause:d})}throw s.error(`\u274C OpenAI proxy request failed: ${d.message}`),new Error(`Failed to format output: ${d.message}`,{cause:d})}}function ie(i){let e=`${i}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let r=t.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)],l=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(){l===void 0?delete process.env[i]:process.env[i]=l}}}import{timeline as ne,Timeline as gt,WORKFLOW_GRAPH_LOG_MARKER_PREFIX as ht}from"@zibby/agent-workflow";import{copyFileSync as we,existsSync as oe,lstatSync as $e,mkdirSync as ae,rmSync as Pe,symlinkSync as Ce,unlinkSync as ke}from"node:fs";import{join as M}from"node:path";import{homedir as Re}from"node:os";import{randomBytes as Ne}from"node:crypto";var Le=["cli-config.json","config.json","auth.json","argv.json"];function le(i){return!(!i||typeof i!="string"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="1"||process.env.ZIBBY_CURSOR_USE_GLOBAL_MCP==="true")}function ue(i){let e=M(i||process.cwd(),".zibby","tmp");ae(e,{recursive:!0});let t=`${process.pid}-${Date.now()}-${Ne(4).toString("hex")}`,r=M(e,`cursor-agent-home-${t}`),o=M(r,".cursor");ae(o,{recursive:!0});let l=Re(),n=M(l,".cursor");if(oe(n))for(let u of Le){let c=M(n,u);if(oe(c))try{we(c,M(o,u))}catch{}}if(process.platform==="darwin"){let u=M(l,"Library");if(oe(u))try{Ce(u,M(r,"Library"))}catch{}}return r}function ce(i){if(!(!i||typeof i!="string"))try{let e=M(i,"Library");try{$e(e).isSymbolicLink()&&ke(e)}catch{}Pe(i,{recursive:!0,force:!0})}catch{}}var ye=class extends Me{constructor(){super("cursor","Cursor (CLI)",100)}canHandle(e){let t=[w(H(),".local","bin","cursor-agent"),w(H(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","agent","cursor-agent"];for(let r of t)try{if(r.startsWith("/")){ge(r,he.X_OK);let o=G(`"${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=G(`which ${r}`,{encoding:"utf-8",timeout:2e3,stdio:"pipe"}).trim();if(!o)continue;let l=G(`${r} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});if(l&&l.length>0)return s.debug(`[Cursor] Found '${r}' in PATH at ${o} (version: ${l.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(e,t={}){let{workspace:r=process.cwd(),print:o=!1,schema:l=null,skills:n=null,sessionPath:u=null,nodeName:c=null,timeout:y=Z.CURSOR_AGENT_DEFAULT,config:d={},signal:m=null}=t,p=d?.agent?.strictMode||!1,O=t.model??d?.agent?.cursor?.model??V.CURSOR,x=ie("CURSOR_API_KEY");try{s.debug(`[Cursor] Invoking (model: ${O}, timeout: ${y/1e3}s, skills: ${JSON.stringify(n)})`);let g=(this._setupMcpConfig(u,r,d,n,c)||{}).isolatedMcpHome??null,T=[w(H(),".local","bin","cursor-agent"),w(H(),".cursor","bin","cursor-agent"),"/usr/local/bin/cursor-agent","/usr/local/bin/agent","agent","cursor-agent"],U=null;for(let h of T)try{if(h.startsWith("/"))ge(h,he.X_OK),G(`"${h}" --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"});else{if(!G(`which ${h}`,{encoding:"utf-8",timeout:2e3}).trim())throw new Error("not in PATH");G(`${h} --version 2>&1`,{encoding:"utf-8",timeout:3e3,stdio:"pipe"})}U=h,s.debug(`[Agent] Using binary: ${h}`);break}catch(a){s.debug(`[Agent] Binary '${h}' check failed: ${a.message}`);continue}if(!U)throw new Error(`Cursor Agent CLI not found or not working.
|
|
43
43
|
|
|
44
44
|
Checked paths:
|
|
45
45
|
${T.map(h=>` - ${h}`).join(`
|
|
@@ -51,28 +51,28 @@ Install cursor-agent:
|
|
|
51
51
|
Then add to PATH:
|
|
52
52
|
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc
|
|
53
53
|
|
|
54
|
-
Test with: agent --version`);let
|
|
55
|
-
\u25C6 Model: ${O||"auto"}${
|
|
56
|
-
`);let D=(await import("chalk")).default,
|
|
57
|
-
${D.bold("Prompt sent to LLM:")}`),console.log(D.dim("\u2500".repeat(60))),console.log(D.dim(
|
|
58
|
-
`)}catch{}let
|
|
59
|
-
`):
|
|
60
|
-
${
|
|
61
|
-
${JSON.stringify(
|
|
62
|
-
${
|
|
54
|
+
Test with: agent --version`);let A=new Q(e),S=null;if(l){let h=`zibby-result-${Date.now()}.json`;S=w(r,".zibby","tmp",h);let a=w(r,".zibby","tmp");Y(a)||me(a,{recursive:!0}),A.addStructuredOutput(l,S)}let J=process.env.CURSOR_API_KEY,j=J?` | key: ***${J.slice(-4)}`:" | key: not set";console.log(`
|
|
55
|
+
\u25C6 Model: ${O||"auto"}${j}
|
|
56
|
+
`);let D=(await import("chalk")).default,b=A.getUserPrompt();console.log(`
|
|
57
|
+
${D.bold("Prompt sent to LLM:")}`),console.log(D.dim("\u2500".repeat(60))),console.log(D.dim(b)),console.log(D.dim("\u2500".repeat(60)));let F=A.build(),R=A.getStats(),N=["--print","--force","--approve-mcps","--output-format","stream-json","--stream-partial-output","--model",O||"auto"];if(process.env.CURSOR_API_KEY&&N.push("--api-key",process.env.CURSOR_API_KEY),N.push(F),s.debug(`[Agent] User prompt: ${R.userPromptLength} chars, System instructions: ${R.systemInstructionsLength} chars (${R.instructionCount} blocks), Full: ${R.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 $,L=null;try{let h=u||(process.env.ZIBBY_SESSION_PATH?String(process.env.ZIBBY_SESSION_PATH).trim():null);$=await this._spawnWithStreaming(U,N,r,y,null,h,g,m)}catch(h){L=h}let P=$?.stdout||"";if(l){let h=typeof l.parse=="function",a=null,E=!!(S&&Y(S));if(S&&s.info(`[Agent] Result file: ${E?"present":"missing"} at ${S}`),E)try{let f=fe(S,"utf-8").trim();a=JSON.parse(f),s.info(`[Agent] Parsed JSON from result file OK (${f.length} chars) \u2192 object ready for validation`),L&&s.debug("[Agent] Agent exited non-zero but result file was written \u2014 recovering")}catch(f){s.warn(`\u26A0\uFE0F [Agent] Result file exists on disk but is not valid JSON: ${f.message}`)}else if(L)s.warn(`[Agent] Result file missing at ${S} (agent process error \u2014 may still recover if strictMode repairs)`);else throw s.error(`\u274C [Agent] Result file was never created at ${S}`),new Error(`Agent did not write required result file at ${S}`);if(a&&h)try{let f=l.parse(a);return s.info("\u2705 [Agent] Zod validation passed for structured result file"),p&&s.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:P,structured:f}}catch(f){let _=f.issues?f.issues.map(v=>` - ${v.path.join(".")}: ${v.message}`).join(`
|
|
59
|
+
`):f.message?.slice(0,400);if(s.error(`\u274C [Agent] Zod validation FAILED - invalid output schema:
|
|
60
|
+
${_}`),s.error(`\u{1F4C4} [Agent] Invalid JSON written to file:
|
|
61
|
+
${JSON.stringify(a,null,2).slice(0,500)}`),!p)throw new Error(`Agent output failed schema validation:
|
|
62
|
+
${_}
|
|
63
63
|
|
|
64
64
|
The agent wrote invalid data that doesn't match the required outputSchema.
|
|
65
|
-
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:
|
|
66
|
-
`),r=null;for(let o of
|
|
67
|
-
`;if(
|
|
68
|
-
`)){let
|
|
69
|
-
${
|
|
70
|
-
`).filter(
|
|
71
|
-
`).filter(
|
|
65
|
+
Enable strictMode in .zibby.config.js for automatic repair.`,{cause:f})}else{if(a)return s.info("\u2705 [Agent] File-based output extracted (no Zod parse fn) \u2014 accepting as structured"),p&&s.debug("[Agent] strictMode enabled but not needed \u2014 agent wrote valid file"),{raw:P,structured:a};E&&s.error("\u274C [Agent] Result file exists but produced no in-memory JSON (parse failed earlier)")}if(p&&!L){let f=$.parsedText,_=a?JSON.stringify(a):f;s.info(`[Agent] strictMode: calling OpenAI proxy to fix structured output (${_.length} chars in)`);try{let v=await se(_,l);if(h){let K=l.parse(v.structured);return s.info("\u2705 [Agent] Proxy output passed Zod validation"),{raw:P,structured:K}}return{raw:P,...v}}catch(v){if(s.warn(`\u26A0\uFE0F [Agent] strictMode proxy failed: ${v.message}`),a)return s.warn("[Agent] Using agent's original result file as fallback"),{raw:P,structured:a}}}if(L)throw L;let I=E?a==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: ${I}`),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 ${S}. Enable strictMode for proxy fallback.`)}if(L)throw L;return this._extractFinalResult(P)||$?.parsedText||P}finally{x.dispose()}}_extractFinalResult(e){if(!e)return null;let t=e.split(`
|
|
66
|
+
`),r=null;for(let o of t){let l=o.trim();if(l)try{let n=JSON.parse(l);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(e,t,r,o=null,l=null){let n=r?.headless,u=w(H(),".cursor"),c=w(u,"mcp.json"),y={};if(Y(c))try{y=JSON.parse(fe(c,"utf-8"))}catch{}let d=y.mcpServers||{},m=r?.paths?.output||Ue,p=w(t||process.cwd(),m,De),O=Array.isArray(o)?o.map(g=>de(g)).filter(Boolean):[...Ge()].map(([,g])=>g),x=new Set;for(let g of O)typeof g.resolve=="function"&&(x.has(g.serverName)||(x.add(g.serverName),this._ensureSkillConfigured(d,g,e,p,l,n)));if(e){let g=de("browser");g&&typeof g.resolve=="function"&&!x.has(g.serverName)&&this._ensureSkillConfigured(d,g,e,p,"execute_live",n)}if(Object.keys(d).length===0)return s.debug("[MCP] No MCP servers configured - agent will run without tool access"),{isolatedMcpHome:null};let k=`${JSON.stringify({mcpServers:d},null,2)}
|
|
67
|
+
`;if(le(e)){let g=ue(t||process.cwd()),T=w(g,".cursor","mcp.json");return pe(T,k,"utf8"),s.debug(`[MCP] Isolated cursor-agent HOME (session-scoped mcp.json): ${g} | servers: ${Object.keys(d).join(", ")}`),{isolatedMcpHome:g}}return Y(u)||me(u,{recursive:!0}),pe(c,k,"utf8"),s.debug(`[MCP] Global ~/.cursor/mcp.json | servers: ${Object.keys(d).join(", ")}`),{isolatedMcpHome:null}}_ensureSkillConfigured(e,t,r,o,l=null,n){let u=t.cursorKey||t.serverName,c=e[u]?u:e[t.serverName]?t.serverName:null;if(c&&r){let d=typeof t.resolve=="function"?t.resolve({sessionPath:r,nodeName:l,headless:n}):null;d?.args?e[c].args=d.args:e[c].args=(e[c].args||[]).map(O=>O.startsWith("--output-dir=")?`--output-dir=${r}`:O);let m=d?.env||{},p=t.sessionEnvKey?{[t.sessionEnvKey]:o}:{};e[c].env={...e[c].env||{},...m,...p},s.debug(`[MCP] Updated ${c} session \u2192 ${r}`);return}if(c)return;let y=t.resolve({sessionPath:r,nodeName:l,headless:n});y&&(e[u]={...y,...t.sessionEnvKey&&{env:{...y.env||{},[t.sessionEnvKey]:o}}},s.debug(`[MCP] Configured ${u}`))}_spawnWithStreaming(e,t,r,o,l=null,n=null,u=null,c=null){return new Promise((y,d)=>{let m=Date.now(),p="",O="",x=Date.now(),k=0,g=!1,T=null,U=!1,A=!1,S=null;if(n)try{S=w(Ke(String(n)),Fe)}catch{S=null}let J=!1,j=()=>{J||(J=!0,ce(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 b=Be(e,t,{cwd:r,shell:!1,stdio:["pipe","pipe","pipe"],env:D,...c&&{signal:c}});s.debug(`[Agent] PID: ${b.pid}`);let F=null,R=()=>{g||A||(g=!0,T="aborted",s.warn("\u{1F6D1} Abort signal \u2014 terminating cursor-agent (SIGKILL in 5s if SIGTERM trapped)"),F=setTimeout(()=>{if(!A){s.warn("\u{1F6D1} SIGTERM not honored \u2014 sending SIGKILL");try{b.kill("SIGKILL")}catch{}}},5e3))};c&&(c.aborted?R():c.addEventListener("abort",R,{once:!0})),b.stdin.on("error",a=>{a.code!=="EPIPE"&&s.warn(`[Agent] stdin error: ${a.message}`)}),b.stdout.on("error",a=>{a.code!=="EPIPE"&&s.warn(`[Agent] stdout error: ${a.message}`)}),b.stderr.on("error",a=>{a.code!=="EPIPE"&&s.warn(`[Agent] stderr error: ${a.message}`)}),l?(b.stdin.write(l,a=>{a&&a.code!=="EPIPE"&&s.warn(`[Agent] Failed to write to stdin: ${a.message}`),b.stdin.end()}),s.debug(`[Agent] Prompt also piped to stdin (${l.length} chars)`)):b.stdin.end();let N=null;S&&(N=setInterval(()=>{if(!(g||A))try{if(Y(S)){g=!0,T="aborted";try{Je(S)}catch{}s.warn("\u{1F6D1} External stop requested \u2014 terminating Cursor agent (and MCP browser session)"),b.kill("SIGTERM"),setTimeout(()=>{b.killed||b.kill("SIGKILL")},2e3)}}catch{}},600));let $=new Set,L=new Date(m).toISOString().replace(/\.\d+Z$/,""),P=setInterval(()=>{let a=Math.round((Date.now()-m)/1e3),E=Math.round((Date.now()-x)/1e3),I=[];try{let _=Math.ceil(a/60)+1,v=G(`find "${r}" -type f -mmin -${_} -not -path '*/node_modules/*' -not -path '*/.git/*' -not -path '*/target/*' 2>/dev/null | head -20`,{encoding:"utf-8",timeout:5e3}).trim();if(v)for(let K of v.split(`
|
|
68
|
+
`)){let te=K.replace(`${r}/`,"");$.has(te)||($.add(te),I.push(te))}}catch{}let f="";I.length>0&&(f=` | \u{1F4C1} new: ${I.map(v=>v.split("/").pop()).join(", ")}`),$.size>0&&(f+=` | \u{1F4E6} total: ${$.size} files`),s.debug(`\u{1F493} [Agent] Running for ${a}s | ${k} lines output${f}`),k===0&&a>=30&&$.size===0&&(a<35&&s.warn(`\u26A0\uFE0F [Agent] No output after ${a}s \u2014 agent may be stuck. Check your CURSOR_API_KEY.`),a>=60&&(g=!0,T=T||"stall",s.error(`\u274C [Agent] No response after ${a}s \u2014 killing. Verify CURSOR_API_KEY is valid and agent CLI works: agent --version`),b.kill("SIGTERM"),setTimeout(()=>{b.killed||b.kill("SIGKILL")},3e3)))},3e4),ee=setTimeout(()=>{g=!0,T=T||"timeout";let a=Math.round((Date.now()-m)/1e3);s.error(`\u23F1\uFE0F [Agent] Timeout after ${a}s \u2014 killing process (PID: ${b.pid})`),p.trim()&&s.warn(`\u{1F4E4} [Agent] Partial output (${p.length} chars) before timeout:
|
|
69
|
+
${p.slice(-2e3)}`),b.kill("SIGTERM"),setTimeout(()=>{b.killed||b.kill("SIGKILL")},5e3)},o),h=new X;h.onToolCall=(a,E)=>{let I=a,f=E;if(a==="mcpToolCall"&&E?.name)I=E.name.replace(/^mcp_+[^_]+_+/,""),I.includes("-")&&I.split("-")[0]===I.split("-")[1]&&(I=I.split("-")[0]),f=E.args??E.input??E;else{if(a==="readToolCall"||a==="editToolCall"||a==="writeToolCall")return;(a.startsWith("mcp__")||a.includes("ToolCall"))&&(I=a.replace(/^mcp_+[^_]+_+/,"").replace(/ToolCall$/,""))}if(I.includes("memory")?ne.stepMemory(`Tool: ${I}`):ne.stepTool(`Tool: ${I}`),f!=null&&typeof f=="object"&&Object.keys(f).length>0&&!A){let v=JSON.stringify(f),K=v.length>100?`${v.substring(0,100)}...`:v;console.log(` Input: ${K}`)}},b.stdout.on("data",a=>{let E=a.toString();p+=E,x=Date.now(),U||(U=!0);let I=h.processChunk(E);I&&!A&&process.stdout.write(I);let f=E.split(`
|
|
70
|
+
`).filter(_=>_.trim());k+=f.length}),b.stderr.on("data",a=>{let E=a.toString();O+=E,x=Date.now(),U||(U=!0);let I=E.split(`
|
|
71
|
+
`).filter(f=>f.trim());for(let f of I)s.warn(`\u26A0\uFE0F [Agent stderr] ${f}`)}),b.on("close",(a,E)=>{if(A=!0,j(),clearTimeout(ee),clearInterval(P),N&&clearInterval(N),F&&clearTimeout(F),c&&!c.aborted)try{c.removeEventListener("abort",R)}catch{}h.flush();let I=Math.round((Date.now()-m)/1e3);if(s.debug(`[Agent] Exited: code=${a}, signal=${E}, elapsed=${I}s, output=${p.length} chars`),g){if(T==="aborted"){let v=new Error("Aborted via signal");v.name="AbortError",d(v);return}d(new Error(`Cursor Agent timed out after ${I}s (limit: ${o/1e3}s). ${k} lines produced. Last output ${Math.round((Date.now()-x)/1e3)}s ago. ${p.trim()?`
|
|
72
72
|
Partial output (last 500 chars):
|
|
73
|
-
${
|
|
74
|
-
Stderr: ${O.slice(-1e3)}`:""}${
|
|
75
|
-
Stdout (last 500 chars): ${
|
|
76
|
-
Binary: ${
|
|
73
|
+
${p.slice(-500)}`:"No output captured."}`));return}if(a!==0){d(new Error(`Cursor Agent failed: exit code ${a}, signal ${c}. ${O.trim()?`
|
|
74
|
+
Stderr: ${O.slice(-1e3)}`:""}${p.trim()?`
|
|
75
|
+
Stdout (last 500 chars): ${p.slice(-500)}`:""}`));return}let f=h.getResult(),_=f?JSON.stringify(f,null,2):h.getRawText()||p||"";y({stdout:p||O||"",parsedText:_})}),b.on("error",a=>{if(j(),clearTimeout(ee),clearInterval(P),N&&clearInterval(N),F&&clearTimeout(F),c&&!c.aborted)try{c.removeEventListener("abort",R)}catch{}d(new Error(`Cursor Agent spawn error: ${a.message}
|
|
76
|
+
Binary: ${e}
|
|
77
77
|
This usually means the binary is not in PATH. Try:
|
|
78
|
-
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};export{
|
|
78
|
+
echo 'export PATH="$HOME/.local/bin:$PATH"' >> ~/.zshrc && source ~/.zshrc`))})})}};export{ye as CursorAgentStrategy};
|
|
@@ -1,43 +1,43 @@
|
|
|
1
|
-
import{AgentStrategy as
|
|
1
|
+
import{AgentStrategy as me,getSkill as ge}from"@zibby/agent-workflow";import{execSync as he,spawn as ye}from"node:child_process";import{zodToJsonSchema as Ie}from"zod-to-json-schema";import{existsSync as ne,mkdirSync as ie,readFileSync as se,rmSync as Oe,writeFileSync as re}from"node:fs";import{join as S}from"node:path";import A from"chalk";var h={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 h.debug;if(process.env.ZIBBY_VERBOSE==="true")return h.info;let e=process.env.LOG_LEVEL?.toLowerCase();return e&&e in h?h[e]:h.info}_shouldLog(e){return h[e]>=this._level}_formatMessage(e,t,i={}){let s=new Date().toISOString(),n=`${this._getPrefix(e)} ${t}`;return Object.keys(i).length>0&&(n+=A.dim(` ${JSON.stringify(i)}`)),n}_getPrefix(e){return{debug:A.gray("[DEBUG]"),info:A.cyan("[INFO]"),warn:A.yellow("[WARN]"),error:A.red("\u274C [ERROR]")}[e]||""}debug(e,t){this._shouldLog("debug")&&console.log(this._formatMessage("debug",e,t))}info(e,t){this._shouldLog("info")&&console.log(this._formatMessage("info",e,t))}warn(e,t){this._shouldLog("warn")&&console.warn(this._formatMessage("warn",e,t))}error(e,t){this._shouldLog("error")&&console.error(this._formatMessage("error",e,t))}setLevel(e){e in h&&(this._level=h[e])}getLevel(){return Object.keys(h).find(e=>h[e]===this._level)}},l=new W;var fe=[{alias:"auto",canonicalId:"claude-sonnet-4-6",vendor:"claude",label:"Claude \xB7 Sonnet 4.6",family:"claude-sonnet-4",pickerVisible:!0,isDefault:!0},{alias:"opus-4.8",canonicalId:"claude-opus-4-8",vendor:"claude",label:"Claude \xB7 Opus 4.8",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"sonnet-4.8",canonicalId:"claude-sonnet-4-8",vendor:"claude",label:"Claude \xB7 Sonnet 4.8",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-8",canonicalId:"claude-sonnet-4-8",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"opus-4.7",canonicalId:"claude-opus-4-7",vendor:"claude",label:"Claude \xB7 Opus 4.7",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"sonnet-4.7",canonicalId:"claude-sonnet-4-7",vendor:"claude",label:"Claude \xB7 Sonnet 4.7",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-7",canonicalId:"claude-sonnet-4-7",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"sonnet-4.6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"opus-4.6",canonicalId:"claude-opus-4-6",vendor:"claude",label:"Claude \xB7 Opus 4.6",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"sonnet-4.5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",label:"Claude \xB7 Sonnet 4.5",family:"claude-sonnet-4",pickerVisible:!0},{alias:"sonnet-4-5",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"opus-4.5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",label:"Claude \xB7 Opus 4.5",family:"claude-opus-4",pickerVisible:!0},{alias:"opus-4-5",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"haiku-4.5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",label:"Claude \xB7 Haiku 4.5",family:"claude-haiku-4"},{alias:"haiku-4-5",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-8",canonicalId:"claude-opus-4-8",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.8"},{alias:"claude-sonnet-4-8",canonicalId:"claude-sonnet-4-8",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.8"},{alias:"claude-opus-4-7",canonicalId:"claude-opus-4-7",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.7"},{alias:"claude-sonnet-4-7",canonicalId:"claude-sonnet-4-7",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.7"},{alias:"claude-sonnet-4-6",canonicalId:"claude-sonnet-4-6",vendor:"claude",family:"claude-sonnet-4",aliasOf:"auto"},{alias:"claude-opus-4-6",canonicalId:"claude-opus-4-6",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.6"},{alias:"claude-sonnet-4-5-20250929",canonicalId:"claude-sonnet-4-5-20250929",vendor:"claude",family:"claude-sonnet-4",aliasOf:"sonnet-4.5"},{alias:"claude-opus-4-5-20251101",canonicalId:"claude-opus-4-5-20251101",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"claude-haiku-4-5-20251001",canonicalId:"claude-haiku-4-5-20251001",vendor:"claude",family:"claude-haiku-4",aliasOf:"haiku-4.5"},{alias:"claude-opus-4-20250514",canonicalId:"claude-opus-4-20250514",vendor:"claude",family:"claude-opus-4",aliasOf:"opus-4.5"},{alias:"auto",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",isDefault:!0},{alias:"o4-mini",canonicalId:"o4-mini",vendor:"codex",label:"Codex \xB7 o4-mini",family:"o4-mini",pickerVisible:!0},{alias:"o3",canonicalId:"o3",vendor:"codex",family:"o3"},{alias:"o3-mini",canonicalId:"o3-mini",vendor:"codex",family:"o3-mini"},{alias:"codex-mini",canonicalId:"codex-mini-latest",vendor:"codex",family:"codex-mini"},{alias:"gpt-4o",canonicalId:"gpt-4o",vendor:"codex",label:"Codex \xB7 GPT-4o",family:"gpt-4o",pickerVisible:!0},{alias:"gpt-4o-mini",canonicalId:"gpt-4o-mini",vendor:"codex",label:"Codex \xB7 GPT-4o mini",family:"gpt-4o-mini",pickerVisible:!0},{alias:"gpt-5.2-codex",canonicalId:"gpt-5.2-codex",vendor:"codex",label:"Codex \xB7 GPT-5.2",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.2",canonicalId:"gpt-5.2",vendor:"codex",label:"Codex \xB7 GPT-5.2 base",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3",canonicalId:"gpt-5.3",vendor:"codex",label:"Codex \xB7 GPT-5.3",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.3-codex",canonicalId:"gpt-5.3-codex",vendor:"codex",family:"gpt-5"},{alias:"gpt-5.4",canonicalId:"gpt-5.4",vendor:"codex",label:"Codex \xB7 GPT-5.4",family:"gpt-5",pickerVisible:!0},{alias:"gpt-5.5",canonicalId:"gpt-5.5",vendor:"codex",label:"Codex \xB7 GPT-5.5",family:"gpt-5",pickerVisible:!0},{alias:"auto",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",isDefault:!0},{alias:"gemini-3-pro",canonicalId:"gemini-3-pro",vendor:"gemini",label:"Gemini \xB7 3 Pro",family:"gemini-3",pickerVisible:!0},{alias:"gemini-3-flash",canonicalId:"gemini-3-flash",vendor:"gemini",label:"Gemini \xB7 3 Flash",family:"gemini-3",pickerVisible:!0},{alias:"gemini-2.5-pro",canonicalId:"gemini-2.5-pro",vendor:"gemini",label:"Gemini \xB7 2.5 Pro",family:"gemini-2.5",pickerVisible:!0},{alias:"gemini-2.5-flash",canonicalId:"gemini-2.5-flash",vendor:"gemini",label:"Gemini \xB7 2.5 Flash",family:"gemini-2.5",pickerVisible:!0}];function L(c){let e={};for(let t of fe)t.vendor===c&&(e[t.alias]=t.canonicalId);return e}var ee={ASSISTANT:"gpt-5.4-nano-2026-03-17",CLAUDE:"claude-sonnet-4-6",CURSOR:"auto",CODEX:"o4-mini",GEMINI:"gemini-3-pro",OPENAI_POSTPROCESSING:"gpt-4o-mini"};var we=L("claude"),ke=L("codex"),te=L("gemini"),Ge={CURSOR_AGENT_DEFAULT:1200*1e3,OPENAI_REQUEST:18e4};import{zodToJsonSchema as pe}from"zod-to-json-schema";var $=class{static generateFileOutputInstructions(e,t){let i;typeof e?.parse=="function"?i=pe(e,{target:"openApi3"}):i=e;let s=this._buildExample(i);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
|
|
5
5
|
You MUST write your final result as pure JSON to this EXACT file path:
|
|
6
6
|
|
|
7
|
-
${
|
|
7
|
+
${t}
|
|
8
8
|
|
|
9
9
|
Use your file writing tool (WriteFile or ApplyPatch) to create this file.
|
|
10
10
|
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(s,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(
|
|
21
|
+
Rules: valid JSON only, no markdown wrapping, no extra text in the file.`}static _buildExample(e){if(!e)return{};let t=e.type;if(t==="object"&&e.properties){let i={};for(let[s,r]of Object.entries(e.properties))i[s]=this._buildExample(r);return i}if(t==="array"&&e.items)return[this._buildExample(e.items)];if(e.enum&&Array.isArray(e.enum)&&e.enum.length>0)return`<${e.enum.join("|")}>`;if(t==="string")return"<string>";if(t==="number"||t==="integer")return 0;if(t==="boolean")return!1;if(e.description)return`<${e.description}>`;if(e.nullable||e.oneOf||e.anyOf){let i=e.oneOf?.find(s=>s.type!=="null")||e.anyOf?.find(s=>s.type!=="null");return i?this._buildExample(i):null}return"<value>"}};var D=class c{constructor(e=""){this.userPrompt=e,this.systemInstructions=[],this.metadata={}}setUserPrompt(e){return this.userPrompt=e,this}appendUserPrompt(e){return this.userPrompt?this.userPrompt+=`
|
|
22
22
|
|
|
23
|
-
${
|
|
23
|
+
${e}`:this.userPrompt=e,this}addSkillHints(e){return e&&this.systemInstructions.push({type:"skill_hints",content:e,position:"prepend"}),this}addStructuredOutput(e,t){if(e&&t){let i=$.generateFileOutputInstructions(e,t);this.systemInstructions.push({type:"structured_output",content:i,position:"append"}),this.metadata.structuredOutputPath=t}return this}addExtraInstructions(e){if(e?.trim()){let t=`\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
|
-
${
|
|
28
|
-
|
|
29
|
-
`),position:"append"}),this}addSystemInstruction(t
|
|
30
|
-
|
|
31
|
-
`)}getStats(){let
|
|
32
|
-
`);this.buffer=
|
|
33
|
-
`,
|
|
34
|
-
`,this.extractedResult=
|
|
35
|
-
${f}`,"schema_instruction","append");let
|
|
36
|
-
${f}`,"json_instruction","append")}let
|
|
37
|
-
\u25C6 Model: ${
|
|
38
|
-
`);let
|
|
39
|
-
${
|
|
40
|
-
${y}`):
|
|
41
|
-
${y.slice(0,1e3)}`),
|
|
42
|
-
`,"utf-8");let
|
|
43
|
-
`,"utf-8")}catch{}return
|
|
27
|
+
${e.trim()}`;this.systemInstructions.push({type:"extra_instructions",content:t,position:"append"})}return this}addSkillFragments(e){return e&&e.length>0&&this.systemInstructions.push({type:"skill_fragments",content:e.join(`
|
|
28
|
+
|
|
29
|
+
`),position:"append"}),this}addSystemInstruction(e,t="custom",i="append"){return e&&this.systemInstructions.push({type:t,content:e,position:i}),this}getUserPrompt(){return this.userPrompt}getSystemInstructions(){return this.systemInstructions}getMetadata(){return this.metadata}build(){let e=this.systemInstructions.filter(s=>s.position==="prepend").map(s=>s.content),t=this.systemInstructions.filter(s=>s.position==="append").map(s=>s.content);return[...e,this.userPrompt,...t].filter(Boolean).join(`
|
|
30
|
+
|
|
31
|
+
`)}getStats(){let e=this.userPrompt.length,t=this.build().length;return{userPromptLength:e,fullPromptLength:t,systemInstructionsLength:t-e,instructionCount:this.systemInstructions.length,instructionTypes:this.systemInstructions.map(i=>i.type)}}clone(){let e=new c(this.userPrompt);return e.systemInstructions=[...this.systemInstructions],e.metadata={...this.metadata},e}};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(e){if(!e)return null;this.buffer+=e;let t=this.buffer.split(`
|
|
32
|
+
`);this.buffer=t.pop()||"";let i="";for(let s of t)if(s.trim())try{let r=JSON.parse(s);this._emitToolCalls(r);let n=this.extractText(r);if(n){if(this.rawText&&n.startsWith(this.rawText)){let o=n.substring(this.rawText.length);this.rawText=n,i+=o}else(!this.rawText.includes(n)||n.length<20)&&(this.rawText+=n,i+=n);this.tryExtractResult(this.rawText)}else this.isValidResult(r)&&(this.rawText+=`${s}
|
|
33
|
+
`,i+=`${s}
|
|
34
|
+
`,this.extractedResult=r)}catch{if(s.includes('"text"')||s.includes('"content"')){let n=s.match(/"text"\s*:\s*"([^"]*)/),o=s.match(/"content"\s*:\s*"([^"]*)/),a=n?n[1]:o?o[1]:null;a&&!this.rawText.includes(a)&&(i+=a,this.rawText+=a)}}return i||null}flush(){if(!this.buffer.trim())return null;let e="";try{let t=JSON.parse(this.buffer);this._emitToolCalls(t);let i=this.extractText(t);i&&(this.rawText+=i,e+=i,this.tryExtractResult(i))}catch{this.rawText+=this.buffer,e+=this.buffer,this.tryExtractResult(this.buffer)}return this.buffer="",e||null}_emitToolCalls(e){if(!this.onToolCall)return;let t=(n,o)=>{if(!n)return;let a=`${n}:${JSON.stringify(o??{})}`;this._lastToolEmit!==a&&(this._lastToolEmit=a,this.onToolCall(n,o??void 0))},i=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(e.type==="tool_use"||e.type==="tool_call"){if(e.name){t(e.name,i(e.input??e.arguments));return}let n=e.tool_call;if(n&&typeof n=="object"&&!Array.isArray(n)){let o=Object.keys(n);if(o.length===1){let a=o[0],u=n[a],d=u&&typeof u=="object"?u.args??u.input??u:void 0;t(a,i(d))}return}return}if(Array.isArray(e.tool_calls)){for(let n of e.tool_calls)t(n.name,i(n.input??n.arguments));return}let s=e.message??e;if(Array.isArray(s?.tool_calls)){for(let n of s.tool_calls)t(n.name,i(n.input??n.arguments));return}let r=s?.content??e.content;if(Array.isArray(r))for(let n of r)(n.type==="tool_use"||n.type==="tool_call")&&n.name&&t(n.name,i(n.input??n.arguments))}extractText(e){if(e.type==="assistant"&&e.message?.content){let t=e.message.content;if(Array.isArray(t))return t.filter(i=>i.type==="text"&&i.text).map(i=>i.text).join("")}return e.type==="thinking"&&e.text||e.text?e.text:e.content&&typeof e.content=="string"?e.content:e.delta?e.delta:null}tryExtractResult(e){if(!e||typeof e!="string")return;let t=[],i=/```json\s*\n?([\s\S]*?)\n?```/g,s;for(;(s=i.exec(e))!==null;){let m=s[1].trim();try{JSON.parse(m),t.push({text:m,source:"markdown"})}catch{}}let r=0,n=0;for(;r<e.length&&(r=e.indexOf("{",r),r!==-1);){let m=0,p=r;for(let g=r;g<e.length;g++)if(e[g]==="{")m++;else if(e[g]==="}"&&(m--,m===0)){p=g,t.push({text:e.substring(r,p+1),source:"brace"}),n++;break}r=p+1}let o=this.extractedResult,a=o?JSON.stringify(o).length:0,u=0,d=-1;for(let m=0;m<t.length;m++){let p=t[m];try{let g=p.text.replace(/,(\s*[}\]])/g,"$1"),_=JSON.parse(g);this.isValidResult(_)&&(u++,a=JSON.stringify(_).length,o=_,d=m)}catch{}}o&&(this.extractedResult=o)}isValidResult(e){if(!e||typeof e!="object"||Array.isArray(e)||e.session_id||e.timestamp_ms||e.type||e.call_id||e.tool_call||e.result&&typeof e.result=="object"&&(e.result.success&&typeof e.result.success=="object"||e.result.error&&typeof e.result.error=="object")||e.args&&typeof e.args=="object")return!1;if(this.zodSchema)try{return this.zodSchema.parse(e),!0}catch{return!1}return!0}getResult(){return this.extractedResult}getRawText(){return this.rawText}static extractResult(e,t=null){let i=new c;i.zodSchema=t,i.processChunk(e),i.flush();let s=i.getResult();return!s&&process.env.LOG_LEVEL==="debug"&&console.error("[StreamingParser] No result extracted from",e?.length||0,"chars"),s}};function q(c){let e=`${c}_POOL`,t=process.env[e];if(!t||typeof t!="string")return{picked:null,count:0,dispose:()=>{}};let i=t.split(/[,\n]+/).map(n=>n.trim()).filter(Boolean);if(i.length===0)return{picked:null,count:0,dispose:()=>{}};let s=i[Math.floor(Math.random()*i.length)],r=process.env[c];return process.env[c]=s,l.debug(`[auth-pool] ${c}: picked 1 of ${i.length} from pool (***${s.slice(-4)})`),{picked:s,count:i.length,dispose(){r===void 0?delete process.env[c]:process.env[c]=r}}}function xe(c){if(!c)return null;let e=String(c),t=e.match(/```(?:json)?\s*([\s\S]*?)```/i);if(t?.[1])try{return JSON.parse(t[1].trim())}catch{}let i=e.indexOf("{");if(i<0)return null;let s=0,r=!1,n=!1,o=-1;for(let a=i;a<e.length;a++){let u=e[a];if(r){n?n=!1:u==="\\"?n=!0:u==='"'&&(r=!1);continue}if(u==='"'){r=!0;continue}if(u==="{"){s===0&&(o=a),s+=1;continue}if(u==="}"){if(s===0)continue;if(s-=1,s===0&&o>=0){let d=e.slice(o,a+1);try{return JSON.parse(d)}catch{o=-1}}}}return null}function ve(c){let e=String(c||"").trim();if(!e)return null;try{return JSON.parse(e)}catch{return xe(e)}}function Ee(c){try{let e=JSON.parse(c);if(typeof e=="string")return e;if(typeof e?.response=="string")return e.response;if(typeof e?.text=="string")return e.text;if(typeof e?.output=="string")return e.output;if(Array.isArray(e?.candidates)&&e.candidates.length>0){let t=e.candidates[0];if(typeof t?.content=="string")return t.content;if(Array.isArray(t?.content?.parts)){let i=t.content.parts.map(s=>typeof s?.text=="string"?s.text:"").join("");if(i.trim())return i}}}catch{}return c}var oe=class extends me{constructor(){super("gemini","Gemini (Google)",70)}canHandle(e){if(!!!(process.env.GEMINI_API_KEY||process.env.GEMINI_API_KEY_POOL||process.env.GOOGLE_API_KEY||process.env.GOOGLE_API_KEY_POOL))return l.debug("GeminiAgentStrategy: GEMINI_API_KEY or GOOGLE_API_KEY not set"),!1;try{return he("gemini --version",{encoding:"utf-8",timeout:5e3,stdio:"pipe"}),!0}catch{return l.warn("[Gemini] gemini CLI not found. Install: npm install -g @google/gemini-cli"),!1}}async invoke(e,t={}){let{model:i,workspace:s=process.cwd(),schema:r=null,skills:n=null,sessionPath:o=null,nodeName:a=null,timeout:u=600*1e3,signal:d=null}=t,m=[q("GEMINI_API_KEY"),q("GOOGLE_API_KEY")];try{let p=i;(!p||p==="auto")&&(p=ee.GEMINI);let g=te[p]||p,_=String(process.env.GEMINI_API_KEY||"").trim(),V=String(process.env.GOOGLE_API_KEY||"").trim(),N=this._resolveSkillsToMcp(n,{sessionPath:o,workspace:s,nodeName:a}),ae=Object.keys(N).length>0,T=new D(e),U=r&&typeof r.parse=="function",w=null;if(r){let f;try{let I=U?Ie(r,{target:"openAi"}):r;f=JSON.stringify(I,null,2)}catch{f="{}"}if(ae){T.addSystemInstruction(`Write valid JSON that matches this schema:
|
|
35
|
+
${f}`,"schema_instruction","append");let I=`zibby-result-${Date.now()}.json`,O=S(s,".zibby","tmp");w=S(O,I),ie(O,{recursive:!0}),T.addStructuredOutput(r,w)}else T.addSystemInstruction(`Return ONLY valid JSON (no markdown, no commentary) that matches this schema:
|
|
36
|
+
${f}`,"json_instruction","append")}let le=T.build(),ce=T.getUserPrompt(),C=T.getStats(),X=String(process.env.GEMINI_API_KEY||process.env.GOOGLE_API_KEY||"").trim(),ue=X?` | key: ***${X.slice(-4)}`:" | key: not set";console.log(`
|
|
37
|
+
\u25C6 Model: ${g||"auto"}${ue}
|
|
38
|
+
`);let M=(await import("chalk")).default;console.log(`
|
|
39
|
+
${M.bold("Prompt sent to LLM:")}`),console.log(M.dim("\u2500".repeat(60))),console.log(M.dim(ce)),console.log(M.dim("\u2500".repeat(60)));let K=this._createGeminiConfigDir(s,N),E=["--output-format","json"];g&&g!=="auto"&&E.push("--model",g);let F=Object.keys(N);if(F.length>0){E.push("--approval-mode","yolo");for(let f of F)E.push("--allowed-mcp-server-names",f);l.info(`[Gemini] Enabling MCP servers: ${F.join(", ")}`)}else n&&n.length>0&&l.warn(`[Gemini] Skills requested but no MCP servers configured: ${n.join(", ")}`);E.push("-p",le);let k={...process.env,GEMINI_CLI_HOME:K};_?(k.GEMINI_API_KEY=_,delete k.GOOGLE_API_KEY):V&&(k.GOOGLE_API_KEY=V,delete k.GEMINI_API_KEY),l.debug(`[Gemini] Command: gemini ${E.slice(0,8).join(" ")}... (${E.length} total args)`),l.debug(`[Gemini] User prompt: ${C.userPromptLength} chars, System instructions: ${C.systemInstructionsLength} chars (${C.instructionCount} blocks), Full: ${C.fullPromptLength} chars`),l.debug(`[Gemini] Config home: ${K}`),l.debug(`[Gemini] GEMINI_CLI_HOME env: ${k.GEMINI_CLI_HOME}`);let Y="",G=null;try{Y=await new Promise((I,O)=>{let x=ye("gemini",E,{cwd:s,env:k,stdio:["ignore","pipe","pipe"],...d&&{signal:d}}),z="",Z="",B=!1,P=null,H=!1,j=setTimeout(()=>{try{x.kill("SIGTERM")}catch{}},u),R=()=>{H||B||(H=!0,P=setTimeout(()=>{if(!B)try{x.kill("SIGKILL")}catch{}},5e3))};d&&(d.aborted?R():d.addEventListener("abort",R,{once:!0})),x.stdout.on("data",v=>{z+=v.toString()}),x.stderr.on("data",v=>{Z+=v.toString()}),x.on("error",v=>{if(clearTimeout(j),P&&clearTimeout(P),d&&!d.aborted)try{d.removeEventListener("abort",R)}catch{}O(v)}),x.on("close",v=>{if(B=!0,clearTimeout(j),P&&clearTimeout(P),d&&!d.aborted)try{d.removeEventListener("abort",R)}catch{}if(H){let Q=new Error("Aborted via signal");return Q.name="AbortError",O(Q)}if(v===0)return I(z.trim());O(new Error(`gemini failed with code ${v}: ${(Z||z).trim()}`))})})}catch(f){G=f}finally{try{Oe(K,{recursive:!0,force:!0})}catch{}}let y=Ee(Y).trim();if(!r){if(G)throw G;return y}if(w){let f=ne(w);if(l.info(`[Gemini] Result file: ${f?"present":"missing"} at ${w}`),f)try{let I=se(w,"utf-8").trim(),O=JSON.parse(I),x=U?r.parse(O):O;return l.info("[Gemini] Structured output recovered from result file"),{raw:y,structured:x}}catch(I){l.warn(`[Gemini] Result file parse/validation failed: ${I.message}`)}else G||l.warn("[Gemini] Result file missing; falling back to stream-parsed JSON")}let b=null;if(r){let f=new J;f.zodSchema=r,f.processChunk(y),f.flush(),b=f.getResult()}if(l.info(`[Gemini] Raw stdout length: ${Y.length} chars`),l.info(`[Gemini] Extracted text length: ${y.length} chars`),l.info(`[Gemini] StreamParser result: ${b?"extracted":"null"}`),b||(y.length<2e3?l.info(`[Gemini] Raw text preview:
|
|
40
|
+
${y}`):l.info(`[Gemini] Raw text preview (first 1000 chars):
|
|
41
|
+
${y.slice(0,1e3)}`),b=ve(y)),!b)throw G||(l.error("[Gemini] Failed to extract valid JSON from output"),l.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 de=U?r.parse(b):b;return{raw:y,structured:de}}finally{for(let p of m)p.dispose()}}_resolveSkillsToMcp(e,t={}){if(!Array.isArray(e)||e.length===0)return{};let i={};for(let s of e){let r=ge(s);if(!r||typeof r.resolve!="function")continue;let n=r.resolve(t);if(!n)continue;let o=r.cursorKey||r.serverName||s,a={command:n.command};n.args?.length&&(a.args=n.args),n.env&&Object.keys(n.env).length>0&&(a.env=n.env),n.cwd&&(a.cwd=n.cwd),i[o]=a}return i}_createGeminiConfigDir(e,t){let i=`${Date.now()}-${Math.random().toString(16).slice(2,10)}`,s=S(e||process.cwd(),".zibby","tmp",`gemini-home-${i}`),r=S(s,".gemini");ie(r,{recursive:!0});let n=S(r,"settings.json"),o={},a=S(process.env.HOME||"",".gemini","settings.json");if(ne(a))try{o=JSON.parse(se(a,"utf-8"))}catch{o={}}let u={...o,mcpServers:{...o.mcpServers&&typeof o.mcpServers=="object"?o.mcpServers:{},...t||{}}};re(n,`${JSON.stringify(u,null,2)}
|
|
42
|
+
`,"utf-8");let d=S(e||process.cwd(),".zibby","tmp","gemini-settings-debug.json");try{re(d,`${JSON.stringify(u,null,2)}
|
|
43
|
+
`,"utf-8")}catch{}return l.debug(`[Gemini] Created isolated config with ${Object.keys(u.mcpServers||{}).length} MCP servers`),l.debug(`[Gemini] MCP servers: ${JSON.stringify(Object.keys(u.mcpServers||{}),null,2)}`),s}};export{oe as GeminiAgentStrategy};
|