grix-connector 4.0.2 → 4.2.0
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/adapter/acp/acp-adapter.js +3 -3
- package/dist/adapter/acp/session-activity.js +1 -1
- package/dist/adapter/claude/claude-bridge-server.js +1 -0
- package/dist/adapter/claude/claude-tools.js +1 -0
- package/dist/adapter/claude/claude-worker-client.js +1 -0
- package/dist/adapter/claude/mcp-http-launcher.js +2 -0
- package/dist/adapter/claude/result-timeout.js +1 -0
- package/dist/adapter/deepseek/deepseek-adapter.js +6 -0
- package/dist/adapter/deepseek/index.js +1 -0
- package/dist/adapter/qwen/index.js +1 -0
- package/dist/adapter/qwen/qwen-adapter.js +4 -0
- package/dist/aibot/client.js +1 -0
- package/dist/aibot/index.js +1 -0
- package/dist/aibot/types.js +0 -0
- package/dist/assets/dsh-bridge/grix-dsh-bridge-4.2.0.tgz +0 -0
- package/dist/assets/dsh-bridge/manifest.json +5 -5
- package/dist/audit/adapters/agy/agy-audit-adapter.js +1 -1
- package/dist/audit/adapters/agy/agy-gen-metadata.js +1 -0
- package/dist/bridge/bridge.js +7 -7
- package/dist/bridge/lifecycle-barrier.js +1 -1
- package/dist/core/access/allowlist-gate.js +1 -0
- package/dist/core/access/allowlist-store.js +1 -0
- package/dist/core/access/index.js +1 -0
- package/dist/core/aibot/connection-manager.js +1 -1
- package/dist/core/config/agent-config-repository.js +2 -0
- package/dist/core/file-ops/handler.js +1 -0
- package/dist/core/file-ops/list-files.js +1 -0
- package/dist/core/file-ops/types.js +0 -0
- package/dist/core/installer/npm-registry.js +4 -4
- package/dist/core/runtime/health.js +1 -1
- package/dist/core/skill-sync/skill-syncer.js +1 -1
- package/dist/core/upgrade/npm-upgrader.js +2 -2
- package/dist/core/upgrade/upgrade-checker.js +1 -1
- package/dist/default-skills/grix-agent-dispatch/SKILL.md +9 -9
- package/dist/grix.js +7 -7
- package/dist/log.js +3 -0
- package/dist/main.js +31 -0
- package/dist/manager.js +1 -2
- package/dist/mcp/stream-http/config.js +1 -0
- package/dist/mcp/stream-http/connection-binding.js +1 -0
- package/dist/mcp/stream-http/event-tool-executor.js +1 -0
- package/dist/mcp/stream-http/gateway.js +1 -0
- package/dist/mcp/stream-http/index.js +1 -0
- package/dist/mcp/stream-http/security.js +1 -0
- package/dist/mcp/stream-http/session-manager.js +1 -0
- package/dist/mcp/stream-http/tool-executor.js +1 -0
- package/dist/mcp/stream-http/tool-registry.js +1 -0
- package/dist/mcp/stream-http/tool-schemas.js +1 -0
- package/dist/service/platform-adapter.js +25 -24
- package/dist/service/process-control.js +1 -1
- package/dist/service/service-manager.js +3 -3
- package/dist/service/service-paths.js +2 -2
- package/dist/service/windows-wrapper-migration.js +1 -0
- package/dist/session/index.js +1 -0
- package/dist/session/manager.js +1 -0
- package/dist/transport/index.js +1 -0
- package/dist/transport/json-rpc.js +3 -0
- package/openclaw-plugin/audit-recorder-worker.js +496 -54
- package/package.json +2 -1
- package/scripts/install-guardian.mjs +35 -19
- package/scripts/upgrade-guardian.mjs +1345 -0
- package/scripts/upgrade-guardian.sh +100 -75
- package/dist/assets/dsh-bridge/grix-dsh-bridge-4.0.2.tgz +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
class i{closed=!1;activeAdmissions=0;close(){this.closed=!0}isClosed(){return this.closed}hasActiveAdmissions(){return this.activeAdmissions>0}tryEnter(){if(this.closed)return null;this.activeAdmissions+=1;let s=!1;return()=>{s||(s=!0,this.activeAdmissions-=1)}}}export{i as LifecycleBarrier};
|
|
1
|
+
class i{closed=!1;activeAdmissions=0;close(){this.closed=!0}open(){this.closed=!1}isClosed(){return this.closed}hasActiveAdmissions(){return this.activeAdmissions>0}tryEnter(){if(this.closed)return null;this.activeAdmissions+=1;let s=!1;return()=>{s||(s=!0,this.activeAdmissions-=1)}}}export{i as LifecycleBarrier};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{readAllowlist as r,writeAllowlist as s}from"./allowlist-store.js";import{log as a}from"../log/index.js";class h{filePath;writeQueue=Promise.resolve();constructor(e){this.filePath=e}async checkAccess(e){if(!e?.trim())return!1;const t=r(this.filePath);return t.includes(e)?!0:t.length===0?this.autoAdd(e):!1}async addOwner(e){e?.trim()&&(this.writeQueue=this.writeQueue.then(async()=>{const t=r(this.filePath);t.includes(e)||(t.push(e),await s(this.filePath,t))}).catch(t=>{a.error("allowlist-gate",`addOwner failed for ${e}: ${t instanceof Error?t.message:t}`)}),await this.writeQueue)}async removeOwner(e){e?.trim()&&(this.writeQueue=this.writeQueue.then(async()=>{const t=r(this.filePath),i=t.filter(l=>l!==e);i.length!==t.length&&await s(this.filePath,i)}).catch(t=>{a.error("allowlist-gate",`removeOwner failed for ${e}: ${t instanceof Error?t.message:t}`)}),await this.writeQueue)}async listOwners(){return r(this.filePath)}autoAdd(e){return new Promise(t=>{this.writeQueue=this.writeQueue.then(async()=>{const i=r(this.filePath);if(i.includes(e)){t(!0);return}if(i.length>0){t(!1);return}await s(this.filePath,[e]),t(!0)}).catch(i=>{a.error("allowlist-gate",`autoAdd failed for ${e}: ${i instanceof Error?i.message:i}`),t(!1)})})}}export{h as AllowlistGate};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{readJSONFile as o,writeJSONFileAtomic as i}from"../util/json-file.js";function n(t){const r=o(t);return r&&typeof r=="object"&&"owners"in r&&Array.isArray(r.owners)?r.owners.filter(e=>typeof e=="string"&&e.trim().length>0):[]}async function s(t,r){await i(t,{owners:r})}export{n as readAllowlist,s as writeAllowlist};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{AllowlistGate as l}from"./allowlist-gate.js";import{readAllowlist as t,writeAllowlist as s}from"./allowlist-store.js";export{l as AllowlistGate,t as readAllowlist,s as writeAllowlist};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{AibotClient as
|
|
1
|
+
import{AibotClient as v}from"./client.js";import{AibotConnectionHandleImpl as y}from"./connection-handle.js";import{isAgentDeletedError as C}from"./errors.js";import{log as d}from"../log/index.js";class _{static MAX_CONSECUTIVE_AUTH_FAILURES=5;_status="closed";get status(){return this._status}async connect(a,g={}){const{maxRetries:E,aborted:A,signal:t,label:p,packetLog:$}=g,u=()=>t?.aborted===!0||A?.()===!0,h=p??a.agentId;this._status="connecting";let l=0,f=0;const w=a.apiKey.length>8?a.apiKey.slice(0,4)+"****"+a.apiKey.slice(-4):"****";for(;;){if(u())throw this._status="closed",new Error("connection aborted");const m=new v(a,{packetLog:$});try{const e=m.connect(),i=t?await new Promise((n,c)=>{let o=!1;const s=()=>{o||(o=!0,m.disconnect(),c(new Error("connection aborted")))};t.addEventListener("abort",s,{once:!0}),t.aborted&&s(),e.then(b=>{o||(o=!0,t.removeEventListener("abort",s),n(b))},b=>{o||(o=!0,t.removeEventListener("abort",s),c(b))})}):await e;if(u())throw m.disconnect(),this._status="closed",new Error("connection aborted");this._status="ready",d.info("connection-manager",`Connected: agent=${a.agentId} key=${w} adapter=${i.adapter_id??""}`);const r=new y(m);return r.authAck=i,r.onError(n=>{d.error(h,`Aibot connection error: ${n instanceof Error?n.message:n}`)}),r.onClose((n,c)=>{d.info(h,`Aibot connection closed: code=${n} reason=${c}`)}),r.onDisconnected(()=>{d.info(h,"Aibot disconnected, attempting reconnect...")}),r}catch(e){if(l++,m.disconnect(),u())throw this._status="closed",new Error("connection aborted");if(C(e))throw this._status="closed",d.error("connection-manager",`Connect aborted: agent deleted on platform agent=${a.agentId} key=${w}`),e;if(e instanceof Error&&/Auth failed/i.test(e.message)){if(f++,f>=_.MAX_CONSECUTIVE_AUTH_FAILURES)throw this._status="closed",new Error(`connection failed: ${f} consecutive auth failures: ${e.message}`)}else f=0;if(E!==void 0&&l>E)throw this._status="closed",new Error(`connection failed after ${l} attempts: ${e instanceof Error?e.message:e}`);if(u())throw this._status="closed",new Error("connection aborted");const i=Math.min(1e3*2**Math.min(l-1,5),3e4),r=Math.floor(i*.2*Math.random());d.error("connection-manager",`Connect failed (attempt ${l}), retrying in ${i+r}ms: ${e instanceof Error?e.message:e}`),t?await new Promise((n,c)=>{let o;const s=()=>{o!==void 0&&clearTimeout(o),t.removeEventListener("abort",s),this._status="closed",c(new Error("connection aborted"))};o=setTimeout(()=>{t.removeEventListener("abort",s),n()},i+r),t.addEventListener("abort",s,{once:!0}),t.aborted&&s()}):await new Promise(n=>setTimeout(n,i+r))}}}}export{_ as ConnectionManager};
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
import{chmodSync as A,existsSync as E,readFileSync as w,readdirSync as N,renameSync as j,unlinkSync as D,writeFileSync as x}from"node:fs";import{randomUUID as S}from"node:crypto";import{basename as b,join as p}from"node:path";function $(h){return h instanceof Error?h.message:String(h)}function z(h){if(!h||typeof h!="object"||Array.isArray(h))return;const t=h.name;return typeof t=="string"?t:void 0}function u(h){return z(h)?.trim()||void 0}class k{configDir;constructor(t){this.configDir=t}scan(){const{documents:t,fileErrors:e,skipped:s}=this.scanDocuments(),c=[];for(const n of t)for(const r of n.agents)c.push({entry:r,file:n.file});const o=new Map;for(const n of c){const r=u(n.entry);if(!r)continue;const i=o.get(r)??[];i.push(n),o.set(r,i)}const a=new Set;for(const[n,r]of o)r.length<2||(a.add(n),e.push({file:r.map(i=>i.file).join(", "),error:`duplicate agent name "${n}"`}));return{entries:c.filter(n=>{const r=u(n.entry);return!r||!a.has(r)}),fileErrors:e,skipped:s}}upsert(t,e="agents.json"){this.assertSafeFileName(e);const s=this.assertCanonicalAgentName(t.name),{documents:c,fileErrors:o}=this.scanDocuments();if(o.length>0){const f=o.map(m=>`${m.file}: ${m.error}`).join("; ");throw new Error(`cannot update agent: ${o.length} config file(s) failed to parse [${f}]`)}const a=c.filter(f=>f.file!==e&&f.agents.some(m=>u(m)===s)).map(f=>f.file);if(a.length>0)throw new Error(`cannot update agent "${t.name}": duplicate definition in ${a.join(", ")}`);const n=p(this.configDir,e),r=this.readWritableRoot(n,e),i=r.agents;if(i!==void 0&&!Array.isArray(i))throw new Error(`cannot update ${e}: agents is not an array`);const d=Array.isArray(i)?i:[],g=[];let l=!1;for(const f of d)if(u(f)!==s)g.push(f);else if(!l)g.push(t),l=!0;else throw new Error(`cannot update agent "${t.name}": duplicate definition in ${e}`);return l||g.push(t),this.writeAtomic(n,{...r,agents:g}),{entry:t,file:e}}insert(t,e="agents.json"){this.assertSafeFileName(e);const s=this.assertCanonicalAgentName(t.name),{documents:c,fileErrors:o}=this.scanDocuments();if(o.length>0){const g=o.map(l=>`${l.file}: ${l.error}`).join("; ");throw new Error(`cannot add agent: ${o.length} config file(s) failed to parse [${g}]`)}const a=c.filter(g=>g.agents.some(l=>u(l)===s));if(a.length>0)throw new Error(`cannot add agent "${t.name}": duplicate definition in ${a.map(g=>g.file).join(", ")}`);const n=p(this.configDir,e),r=this.readWritableRoot(n,e,"add"),i=r.agents;if(i!==void 0&&!Array.isArray(i))throw new Error(`cannot add ${e}: agents is not an array`);const d=Array.isArray(i)?i:[];if(d.some(g=>u(g)===s))throw new Error(`cannot add agent "${t.name}": duplicate definition in ${e}`);return this.writeAtomic(n,{...r,agents:[...d,t]}),{entry:t,file:e}}assertCanAdd(t,e="agents.json"){this.assertSafeFileName(e);const s=this.assertCanonicalAgentName(t.name),c=this.readWritableRoot(p(this.configDir,e),e,"add");if(c.agents!==void 0&&!Array.isArray(c.agents))throw new Error(`cannot add ${e}: agents is not an array`);const{documents:o,fileErrors:a}=this.scanDocuments();if(a.length>0){const r=a.map(i=>`${i.file}: ${i.error}`).join("; ");throw new Error(`cannot add agent: ${a.length} config file(s) failed to parse [${r}]`)}const n=o.filter(r=>r.agents.some(i=>u(i)===s));if(n.length>0)throw new Error(`cannot add agent "${t.name}": duplicate definition in ${n.map(r=>r.file).join(", ")}`)}updateExisting(t,e){const s=this.assertCanonicalAgentName(t),{documents:c,fileErrors:o}=this.scanDocuments();if(o.length>0){const f=o.map(m=>`${m.file}: ${m.error}`).join("; ");throw new Error(`cannot update agent: ${o.length} config file(s) failed to parse [${f}]`)}const a=[];for(const f of c)f.agents.forEach((m,y)=>{u(m)===s&&a.push({document:f,index:y})});if(a.length===0)throw Object.assign(new Error(`Agent "${t}" not found in local config`),{code:"NOT_FOUND"});if(a.length>1){const f=[...new Set(a.map(({document:m})=>m.file))];throw new Error(`cannot update agent "${t}": duplicate definition in ${f.join(", ")}`)}const{document:n,index:r}=a[0],i=n.agents[r],d=e(i);if(!d||typeof d!="object"||Array.isArray(d))throw new Error(`cannot update agent "${t}": updater returned an invalid entry`);if(this.assertCanonicalAgentName(d.name)!==s)throw new Error(`cannot rename agent "${t}" while updating its configuration`);const l=[...n.agents];return l[r]=d,this.writeAtomic(p(this.configDir,n.file),{...n.root,agents:l}),{entry:d,file:n.file}}remove(t){const e=this.assertCanonicalAgentName(t),{documents:s,fileErrors:c}=this.scanDocuments();if(c.length>0){const n=c.map(r=>`${r.file}: ${r.error}`).join("; ");throw new Error(`cannot remove agent: ${c.length} config file(s) failed to parse [${n}]`)}const o=[];for(const n of s){const r=n.agents.filter(i=>u(i)!==e);r.length!==n.agents.length&&o.push({filePath:p(this.configDir,n.file),previousText:n.rawText,nextValue:{...n.root,agents:r}})}const a=[];try{for(const n of o)this.writeAtomic(n.filePath,n.nextValue),a.push(n)}catch(n){const r=[];for(const i of a.reverse())try{this.writeAtomicText(i.filePath,i.previousText)}catch(d){r.push(d)}throw r.length>0?new AggregateError([n,...r],`cannot remove agent "${t}": config rollback failed`):n}}scanDocuments(){const t=[],e=[],s=[],c=N(this.configDir).filter(o=>o.endsWith(".json")).sort();for(const o of c)try{const a=w(p(this.configDir,o),"utf8"),n=JSON.parse(a);if(!n||typeof n!="object"||Array.isArray(n)||!("agents"in n)){s.push(o);continue}const r=n;if(!Array.isArray(r.agents)){e.push({file:o,error:"agents is not an array"});continue}t.push({root:r,agents:r.agents,file:o,rawText:a})}catch(a){e.push({file:o,error:$(a)})}return{documents:t,fileErrors:e,skipped:s}}readWritableRoot(t,e,s="update"){if(!E(t))return{};let c;try{c=JSON.parse(w(t,"utf8"))}catch(o){throw new Error(`cannot ${s} ${e}: ${$(o)}`)}if(!c||typeof c!="object"||Array.isArray(c))throw new Error(`cannot ${s} ${e}: invalid root`);return c}writeAtomic(t,e){this.writeAtomicText(t,`${JSON.stringify(e,null,4)}
|
|
2
|
+
`)}writeAtomicText(t,e){const s=`${t}.${S()}.tmp`;try{x(s,e,{encoding:"utf8",mode:384,flag:"wx"}),j(s,t);try{A(t,384)}catch{}}finally{try{D(s)}catch{}}}assertSafeFileName(t){if(!t.endsWith(".json")||b(t)!==t)throw new Error(`invalid agent config file: ${t}`)}assertCanonicalAgentName(t){if(typeof t!="string"||!t.trim())throw new Error("agent name is required");const e=t.trim();if(t!==e)throw new Error(`agent name must not contain leading or trailing whitespace: "${t}"`);return e}}export{k as AgentConfigRepository};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{mkdir as m}from"node:fs/promises";import{join as c,basename as l}from"node:path";import{homedir as _}from"node:os";import{listFiles as u}from"./list-files.js";function d(){return _()}async function f(a,s){const o=a.params??{},t=o.parent_id?.trim(),i=o.show_hidden??!1;let e;t?e=t:e=s.resolveCwd()||d();try{return{status:"ok",result:{files:await u(e,i),current_path:e}}}catch(r){return r?.code==="ENOENT"?{status:"failed",error_code:"path_not_found",error_msg:`Directory not found: ${e}`}:r?.code==="ENOTDIR"?{status:"failed",error_code:"not_a_directory",error_msg:`Not a directory: ${e}`}:{status:"failed",error_code:"list_failed",error_msg:String(r.message||r)}}}async function p(a,s){const o=a.params??{},t=o.name?.trim(),i=o.parent_id?.trim();if(!t)return{status:"failed",error_code:"name_required",error_msg:"Folder name is required"};if(/[/\\]/.test(t))return{status:"failed",error_code:"invalid_name",error_msg:"Folder name must not contain path separators"};const e=i||s.resolveCwd()||d(),r=c(e,t);try{return await m(r),{status:"ok",result:{id:r,name:l(r),is_directory:!0}}}catch(n){return n?.code==="EEXIST"?{status:"failed",error_code:"already_exists",error_msg:`Folder already exists: ${r}`}:{status:"failed",error_code:"create_failed",error_msg:String(n.message||n)}}}export{p as handleCreateFolderAction,f as handleFileListAction};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import{readdir as r,stat as m}from"node:fs/promises";import{join as l,extname as d}from"node:path";const x={pdf:"application/pdf",doc:"application/msword",docx:"application/vnd.openxmlformats-officedocument.wordprocessingml.document",xls:"application/vnd.ms-excel",xlsx:"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",ppt:"application/vnd.ms-powerpoint",pptx:"application/vnd.openxmlformats-officedocument.presentationml.presentation",txt:"text/plain",md:"text/markdown",csv:"text/csv",json:"application/json",xml:"application/xml",yaml:"text/yaml",yml:"text/yaml",html:"text/html",css:"text/css",js:"text/javascript",ts:"text/typescript",zip:"application/zip",rar:"application/x-rar-compressed","7z":"application/x-7z-compressed",tar:"application/x-tar",gz:"application/gzip",jpg:"image/jpeg",jpeg:"image/jpeg",png:"image/png",gif:"image/gif",webp:"image/webp",svg:"image/svg+xml",mp4:"video/mp4",mov:"video/quicktime",avi:"video/x-msvideo",mkv:"video/x-matroska",webm:"video/webm",mp3:"audio/mpeg",wav:"audio/wav",flac:"audio/flac",aac:"audio/aac"};function n(a){const p=d(a).slice(1).toLowerCase();return x[p]}async function f(a,p=!1){const c=await r(a,{withFileTypes:!0}),s=[];for(const i of c){if(!p&&i.name.startsWith("."))continue;const t=l(a,i.name),e={id:t,name:i.name,is_directory:i.isDirectory()};try{if(i.isDirectory()){const o=await m(t);e.modified_at=o.mtime.toISOString()}else{const o=await m(t);e.size=o.size,e.modified_at=o.mtime.toISOString(),e.mime_type=n(i.name)}}catch{}s.push(e)}return s.sort((i,t)=>i.is_directory!==t.is_directory?i.is_directory?-1:1:i.name.localeCompare(t.name)),s}export{f as listFiles,n as resolveMimeType};
|
|
File without changes
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import{execFile as
|
|
2
|
-
[${
|
|
3
|
-
${
|
|
4
|
-
${
|
|
1
|
+
import{execFile as w,execFileSync as $}from"node:child_process";import{existsSync as O}from"node:fs";import{dirname as T,join as y}from"node:path";import{promisify as k}from"node:util";import{log as I}from"../log/logger.js";import{probeUrls as v}from"./speed-test.js";const C=k(w),A=1e4,x=2,M=3e3;function R(t,e={}){if((e.platform??process.platform)!=="win32")return{command:"npm",args:t};const i=e.env??process.env,o=e.nodePath??process.execPath,u=[typeof i.npm_execpath=="string"?i.npm_execpath:"",y(T(o),"node_modules","npm","bin","npm-cli.js")];try{const n=$("where.exe",["npm.cmd"],{encoding:"utf-8",timeout:3e3,windowsHide:!0}).split(/\r?\n/).map(l=>l.trim()).filter(Boolean);for(const l of n)u.push(y(T(l),"node_modules","npm","bin","npm-cli.js"))}catch{}const s=u.find(n=>n&&O(n));if(!s)throw new Error("Unable to locate npm-cli.js for safe Windows execution");return{command:o,args:[s,...t]}}class b extends Error{output;constructor(e,r){super(e),this.name="NpmInstallError",this.output=r}}const f=[{id:"official",label:"npm \u5B98\u65B9",url:"https://registry.npmjs.org"},{id:"npmmirror",label:"npmmirror (\u6DD8\u5B9D\u955C\u50CF)",url:"https://registry.npmmirror.com"}];async function P(){const t=await v(f.map(r=>({url:r.url,label:r.label})),5e3),e=[];for(const r of t)if(r.reachable){const i=f.find(o=>o.url===r.url);i&&e.push(i)}for(const r of t)if(!r.reachable){const i=f.find(o=>o.url===r.url);i&&!e.includes(i)&&e.push(i)}for(const r of f)e.includes(r)||e.push(r);return e}async function B(){try{const t=R(["config","get","registry"]),{stdout:e}=await C(t.command,t.args,{timeout:A,encoding:"utf-8"});return e.trim()}catch{return"https://registry.npmjs.org"}}async function J(t,e,r,i){const o=await P();if(o.length===0)throw new Error("All npm registries are unreachable. Check your network connection.");let u="",s="";for(const n of o)for(let l=0;l<=x;l++)try{return I.info("installer",`npm install ${t} using ${n.label} (${n.url})`),{output:await D(t,n.url,e,r,i),registry:n.label,registryUrl:n.url}}catch(a){const c=a instanceof Error?a.message:String(a),d=L(a);if(u=c,s=F(`${s}
|
|
2
|
+
[${n.label}] ${c}
|
|
3
|
+
${d}`.trim(),r),I.info("installer",`${n.label} failed: ${c.slice(0,200)}`),j(c)&&l<x){await new Promise(m=>setTimeout(m,M));continue}if(!U(c))throw new b(c,s);break}throw new b(`npm install failed on all registries. Last error: ${u}`,s)}function U(t){return/ECONNRESET|ETIMEDOUT|ECONNREFUSED|ENOTFOUND|EAI_AGAIN|ERR_SOCKET_TIMEOUT|getaddrinfo|socket hang up|network|fetch failed|timed out|tunneling socket|self.signed|404|ETARGET|No matching version|notarget/i.test(t)}function j(t){return/\bEBUSY\b|resource busy or locked|EPERM[^\n]*\brename\b|\bELOCKED\b/i.test(t)}function D(t,e,r,i,o){return new Promise((u,s)=>{const n=["install","-g",t,"--registry",e,"--prefer-online","--no-audit","--no-fund"];o?.prefix&&n.push("--prefix",o.prefix);const l=process.platform==="win32",a=R(n,{env:o?.env});let c=!1,d=Promise.resolve(),m;const g=w(a.command,a.args,{maxBuffer:i,windowsHide:!0,env:o?.env},async(p,_,N)=>{clearTimeout(m),await d;const E=`${_??""}
|
|
4
|
+
${N??""}`.trim();if(p){const h=E||p.message,S=c||p.killed===!0?`ETIMEDOUT: npm install exceeded ${r}ms (registry likely unreachable): ${h}`:h;s(new b(S,E||h));return}u(E)});m=setTimeout(()=>{c=!0,l&&g.pid?d=new Promise(p=>{w("taskkill",["/PID",String(g.pid),"/T","/F"],{windowsHide:!0,timeout:1e4},()=>{g.kill("SIGTERM"),p()})}):g.kill("SIGTERM")},r),m.unref?.()})}function L(t){if(t&&typeof t=="object"&&"output"in t){const e=t.output;return typeof e=="string"?e:""}return""}function F(t,e){return t.length<=e?t:t.slice(-e)}function Q(t){return f.map(e=>({label:e.label,command:`npm install -g ${t} --registry ${e.url}`}))}export{f as NPM_REGISTRIES,b as NpmInstallError,B as getCurrentRegistry,Q as getMirrorInstallCommands,U as isRetriableRegistryError,j as isTransientInstallError,J as npmInstallWithMirror,P as probeRegistries,R as resolveNpmInvocation};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{createServer as
|
|
1
|
+
import{createServer as h}from"node:http";import{log as s}from"../log/logger.js";import{resolveClientVersion as v}from"../util/client-version.js";class f{server=null;startTime=Date.now();alive=!0;statusProvider=null;metaProvider=null;version=v();setStatusProvider(e){this.statusProvider=e}setMetaProvider(e){this.metaProvider=e}async start(e){return new Promise((o,n)=>{this.server=h((a,t)=>{if(a.url==="/healthz")if(this.alive){const r=this.statusProvider?.();let i;try{i=this.metaProvider?.()}catch(l){s.warn("health",`meta provider failed: ${l}`)}t.writeHead(200,{"Content-Type":"application/json"}),t.end(JSON.stringify({status:"ok",version:this.version,uptime:Math.floor((Date.now()-this.startTime)/1e3),pid:process.pid,...r?{agents:r}:{},...i??{}}))}else t.writeHead(503,{"Content-Type":"application/json"}),t.end(JSON.stringify({status:"shutting_down"}));else t.writeHead(404),t.end()}),this.server.listen(e,"127.0.0.1",()=>{s.info("health",`Listening on 127.0.0.1:${e}`),o()}),this.server.on("error",n)})}markShuttingDown(){this.alive=!1}async stop(){if(this.server)return new Promise(e=>{this.server.close(()=>e())})}}export{f as HealthServer};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{mkdir as y,writeFile as v,rm as
|
|
1
|
+
import{mkdir as y,writeFile as v,rm as p}from"node:fs/promises";import{join as d}from"node:path";import{createHash as _}from"node:crypto";import{log as l}from"../log/index.js";import{readSkillManifest as O,writeSkillManifest as I}from"./manifest.js";const D=6*36e5,w=15e3;class R{configs;skillsDir;timer=null;running=!1;rerunPending=!1;stopped=!1;fetchImpl;intervalMs;onSyncSuccessHandler=null;constructor(t,r,n={}){this.configs=t,this.skillsDir=r,this.intervalMs=n.intervalMs??D,this.fetchImpl=n.fetchImpl??fetch}async start(){this.stopped=!1,await this.syncOnce().catch(t=>l.warn("skill-sync",`initial sync failed: ${c(t)}`)),!this.stopped&&(this.timer=setInterval(()=>{this.syncOnce().catch(t=>l.warn("skill-sync",`sync failed: ${c(t)}`))},this.intervalMs),this.timer.unref?.())}stop(){this.stopped=!0,this.rerunPending=!1,this.timer&&(clearInterval(this.timer),this.timer=null)}setOnSyncSuccess(t){this.onSyncSuccessHandler=t}triggerSync(){if(!this.stopped){if(this.running){this.rerunPending=!0;return}this.syncOnce().catch(t=>l.warn("skill-sync",`triggered sync failed: ${c(t)}`))}}async syncOnce(){if(!this.stopped&&!this.running){this.running=!0;try{const t=await this.pickReachable();if(!t)return;const{cfg:r,remote:n}=t;await y(this.skillsDir,{recursive:!0});const i=await O(this.skillsDir),o=JSON.stringify(i),g=new Set(n.map(e=>e.name));for(const e of n){const s=i.skills[e.name];if(s&&s.digest===e.digest){const f=e.owner_id!==void 0?e.owner_id:s.owner_id,$=f==="0",h={...s,id:e.id,version:e.version,...f!==void 0?{owner_id:f}:{},system:$};(s.id!==h.id||s.version!==h.version||s.owner_id!==h.owner_id||s.system!==h.system)&&(i.skills[e.name]=h);continue}const S=e.owner_id==="0",u=M(e.name);if(!u){l.warn("skill-sync",`skip skill with unsafe name: ${e.name}`);continue}const m=await this.fetchContent(r,e.id);if(m!==null)try{await y(d(this.skillsDir,u),{recursive:!0}),await v(d(this.skillsDir,u,"SKILL.md"),m,"utf8"),i.skills[e.name]={id:e.id,version:e.version,digest:e.digest,dir:u,...e.owner_id!==void 0?{owner_id:e.owner_id}:{},system:S},s&&s.dir!==u&&!this.dirSharedByOthers(i,e.name,s.dir)&&await p(d(this.skillsDir,s.dir),{recursive:!0,force:!0}).catch(()=>{})}catch(f){l.warn("skill-sync",`write skill "${e.name}" failed: ${c(f)}`)}}for(const e of Object.keys(i.skills)){if(g.has(e))continue;const s=i.skills[e];this.dirSharedByOthers(i,e,s.dir)||await p(d(this.skillsDir,s.dir),{recursive:!0,force:!0}).catch(()=>{}),delete i.skills[e]}if(!(JSON.stringify(i)!==o))return;await I(this.skillsDir,i);try{this.onSyncSuccessHandler?.()}catch(e){l.warn("skill-sync",`onSyncSuccess handler failed: ${c(e)}`)}}finally{this.running=!1,this.rerunPending&&(this.rerunPending=!1,(this.timer!==null||!this.stopped)&&this.syncOnce().catch(t=>l.warn("skill-sync",`rerun sync failed: ${c(t)}`)))}}}dirSharedByOthers(t,r,n){return Object.entries(t.skills).some(([i,o])=>i!==r&&o.dir===n)}async pickReachable(){for(const t of this.configs){if(!t.apiKey||!t.wsUrl)continue;const r=await this.fetchList(t);if(r!==null)return{cfg:t,remote:r}}return null}async fetchList(t){const r=`${k(t.wsUrl)}/v1/agent-api/skills`;try{const n=await this.fetchImpl(r,{headers:{Authorization:`Bearer ${t.apiKey}`},signal:AbortSignal.timeout(w)});if(!n.ok)return l.warn("skill-sync",`list returned ${n.status}`),null;const i=await n.json();return i.code!==0?null:i.data?.items??[]}catch(n){return l.warn("skill-sync",`list error: ${c(n)}`),null}}async fetchContent(t,r){const n=`${k(t.wsUrl)}/v1/agent-api/skills/${encodeURIComponent(r)}/content`;try{const i=await this.fetchImpl(n,{headers:{Authorization:`Bearer ${t.apiKey}`},signal:AbortSignal.timeout(w)});if(!i.ok)return l.warn("skill-sync",`content ${r} returned ${i.status}`),null;const o=await i.json();return o.code!==0?null:typeof o.data?.content=="string"?o.data.content:null}catch(i){return l.warn("skill-sync",`content ${r} error: ${c(i)}`),null}}}function k(a){return new URL(a.replace(/^wss:/,"https:").replace(/^ws:/,"http:")).origin}function M(a){const t=a.trim().replace(/[/\\]/g,"_").replace(/[<>:"|?*\u0000-\u001f]/g,"_").replace(/^\.+/,"").replace(/[. ]+$/,"");return!t||t.includes("..")||/^(con|prn|aux|nul|com[1-9]|lpt[1-9])$/i.test(t)?null:t!==a?`${t}-${_("sha1").update(a).digest("hex").slice(0,8)}`:t}function c(a){return a instanceof Error?a.message:String(a)}export{D as DEFAULT_INTERVAL_MS,R as SkillSyncer};
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{execFile as C,execFileSync as h}from"node:child_process";import{promisify as j}from"node:util";import{existsSync as c,mkdirSync as $,mkdtempSync as H,readFileSync as _,renameSync as f,rmSync as g,statfsSync as G,symlinkSync as J,unlinkSync as x,writeFileSync as Y}from"node:fs";import{basename as D,join as u,relative as K,resolve as p,sep as k}from"node:path";import{GRIX_PATHS as F}from"../log/index.js";import{appendRotatingFileSync as W}from"../log/rotation.js";import{getMachineName as X}from"../util/host-info.js";import{resolveInstallId as z}from"../util/install-id.js";import{npmInstallWithMirror as N,probeRegistries as q}from"../installer/npm-registry.js";const Q=j(C);class a extends Error{code;constructor(t,r){super(r),this.name="UpgradeError",this.code=t}}const M=".grix-upgrade-backup",Z=".grix-upgrade-failed";function O(){return u(F.log,"upgrade.log")}function w(){return u(F.data,"upgrade-pending.json")}function ge(){return c(w())}function S(){const e=w();if(!c(e))return null;try{return JSON.parse(_(e,"utf-8"))}catch{return null}}function me(e,t){const r={from_version:e,target_version:t,upgraded_at:new Date().toISOString(),crash_count:0},n=w();A(n,r)}function he(e){const t=e.package_dir;if(!t)return null;const r=p(t);if(!r.includes(`${k}node_modules${k}`))return null;try{const n=JSON.parse(_(u(r,"package.json"),"utf-8"));return n.name!=="grix-connector"||typeof n.version!="string"?null:n.version.trim().replace(/^v/,"")||null}catch{return null}}function A(e,t){const r=e+".tmp";Y(r,JSON.stringify(t),"utf-8"),f(r,e)}function b(e,t){const r=p(e);return p(t)===`${r}${M}`&&r.includes(`${k}node_modules${k}`)&&D(r).length>0}function ee(e,t){const r=S();!r||!b(e,t)||(r.package_dir=p(e),r.backup_dir=p(t),A(w(),r))}function _e(e=S()){const t=e?.package_dir,r=e?.backup_dir;if(!(!t||!r||!b(t,r)))try{g(r,{recursive:!0,force:!0})}catch{}}function we(e=S()){const t=e?.package_dir,r=e?.backup_dir;if(!t||!r||!b(t,r)||!c(r))return!1;const n=`${t}${Z}`;try{return g(n,{recursive:!0,force:!0}),c(t)&&f(t,n),f(r,t),g(n,{recursive:!0,force:!0}),d(`atomic rollback restored ${t}`),!0}catch(i){try{!c(t)&&c(n)&&f(n,t)}catch{}return d(`atomic rollback failed: ${i instanceof Error?i.message:String(i)}`),!1}}function ye(){const e=w();if(c(e))try{x(e)}catch{}}function d(e){const t=`[${new Date().toISOString()}] ${e}
|
|
2
|
-
`;try{
|
|
1
|
+
import{execFile as _t,execFileSync as b}from"node:child_process";import{randomUUID as X}from"node:crypto";import{promisify as mt}from"node:util";import{uptime as ht}from"node:os";import{closeSync as wt,copyFileSync as St,cpSync as yt,existsSync as d,linkSync as kt,mkdirSync as S,mkdtempSync as Et,openSync as Pt,readFileSync as P,renameSync as h,rmSync as g,statfsSync as It,symlinkSync as vt,unlinkSync as C,writeFileSync as D}from"node:fs";import{basename as I,dirname as m,join as l,relative as q,resolve as s,sep as N}from"node:path";import{GRIX_PATHS as $}from"../log/index.js";import{appendRotatingFileSync as xt}from"../log/rotation.js";import{getMachineName as Dt}from"../util/host-info.js";import{resolveInstallId as $t}from"../util/install-id.js";import{NPM_REGISTRIES as Nt,npmInstallWithMirror as Rt,probeRegistries as At,resolveNpmInvocation as F}from"../installer/npm-registry.js";import{resolveWindowsServiceRuntimeDir as Z}from"../../service/service-paths.js";const Q=mt(_t);class f extends Error{code;constructor(r,e){super(e),this.name="UpgradeError",this.code=r}}const bt=/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/;function G(t){const r=String(t??"").trim().replace(/^v(?=\d)/,"");if(!bt.test(r))throw new f("INVALID_VERSION",`Invalid connector upgrade version: ${String(t)}`);return r}const W=".grix-upgrade-backup",Ft=".grix-upgrade-failed",tt=".grix-upgrade-backup",rt=".grix-upgrade-next",Ut="upgrade-wrapper.pause.json",Lt="upgrade-rollback.intent.json",Tt=".grix-connector-upgrade.lock",et=[250,750],U=[100,250,750,1500];function nt(){return l($.log,"upgrade.log")}function y(){return l($.data,"upgrade-pending.json")}function dr(){let t=null;try{t=p()}catch{return{in_progress:!1}}if(!t)return{in_progress:!1};const r=t.phase??"staged";return{in_progress:!(r==="failed"||r==="rolled_back"),phase:r,from:t.from_version,target:t.target_version}}function lr(){return d(y())}function p(){const t=y();if(!d(t))return null;try{return JSON.parse(P(t,"utf-8"))}catch{return null}}function pr(t,r,e){const n={from_version:t,target_version:r,upgraded_at:new Date().toISOString(),crash_count:0,transaction_id:X(),...e?{phase:e}:{}},i=y();S(m(i),{recursive:!0});let a;try{a=Pt(i,"wx",384)}catch(o){throw o?.code==="EEXIST"?new f("UPGRADE_IN_PROGRESS","Another connector upgrade transaction is already active"):o}try{D(a,JSON.stringify(n),"utf-8")}catch(o){try{C(i)}catch{}throw o}finally{wt(a)}return n}function gr(t){const r=t.package_dir;if(!r)return null;const e=s(r);if(!e.includes(`${N}node_modules${N}`))return null;try{const n=JSON.parse(P(l(e,"package.json"),"utf-8"));return n.name!=="grix-connector"||typeof n.version!="string"?null:n.version.trim().replace(/^v/,"")||null}catch{return null}}function Mt(t,r){S(m(t),{recursive:!0});const e=`${t}.tmp-${process.pid}`;D(e,JSON.stringify(r),"utf-8"),h(e,t)}function x(t,r){const e=p();if(!e)throw new f("PENDING_MISSING","Upgrade transaction is missing");if(r&&e.transaction_id!==r)throw new f("UPGRADE_TRANSACTION_CHANGED","Upgrade transaction ownership changed");const n={...e,...t};return Mt(y(),n),n}function V(){return l($.data,Ut)}function Ot(){return l($.data,Lt)}function _r(t,r){const e=p();if(!e?.transaction_id||e.phase!=="staged"||r&&e.transaction_id!==r)throw new f("INVALID_UPGRADE_STATE","Windows upgrade is not staged for activation");const n=V();S(m(n),{recursive:!0});const i=`${n}.tmp-${process.pid}`;return D(i,JSON.stringify({transaction_id:e.transaction_id}),"utf-8"),h(i,n),x({phase:"handoff_ready",old_pid:t,old_command_line:Ct(t)??void 0,old_boot_time:Date.now()-ht()*1e3,activation_started_at:new Date().toISOString(),wrapper_pause_file:n},e.transaction_id)}function Ct(t){if(process.platform!=="win32"||!Number.isInteger(t)||t<=0)return null;try{const r=`${process.env.SystemRoot||"C:\\Windows"}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;return b(r,["-NoProfile","-NonInteractive","-WindowStyle","Hidden","-Command",`(Get-CimInstance Win32_Process -Filter 'ProcessId=${t}').CommandLine`],{encoding:"utf-8",timeout:3e3,windowsHide:!0}).trim()||null}catch{return null}}function mr(t,r){const e=p();if(!e?.transaction_id||e.transaction_id!==t||e.phase!=="verifying")throw new f("INVALID_UPGRADE_STATE","Windows upgrade is not awaiting verification");const n=Ot();S(m(n),{recursive:!0});const i=`${n}.tmp-${process.pid}`;D(i,JSON.stringify({transaction_id:t,message:r}),"utf-8"),h(i,n);const a=V();S(m(a),{recursive:!0});const o=`${a}.tmp-${process.pid}`;return D(o,JSON.stringify({transaction_id:t}),"utf-8"),h(o,a),x({phase:"rolling_back",guardian_pid:void 0,error_code:"STARTUP_CRASH",error_msg:r,wrapper_pause_file:a},t)}function hr(){try{g(V(),{force:!0})}catch{}}function Gt(t=p()){if(H(t)){try{g(s(t.staging_prefix),{recursive:!0,force:!0})}catch{}if(it(t))try{g(s(t.runtime_next_dir),{recursive:!0,force:!0})}catch{}}}function it(t){if(!t?.runtime_dir||!t.runtime_backup_dir||!t.runtime_next_dir)return!1;const r=s(t.runtime_dir),e=Z($.base),n=l(m(m(e)),"runtime"),i=r===s(n),a=r===s(e)&&/^GrixConnectorDaemon-[0-9a-f]{12}$/.test(I(r))&&I(m(r))==="runtimes"&&I(m(m(r)))==="grix-connector";return(i||a)&&s(t.runtime_backup_dir)===`${r}${tt}`&&s(t.runtime_next_dir)===`${r}${rt}`}function B(t){return l(s(t),Tt)}function Y(t){try{const r=d(t)&&!d(l(t,"owner.json"))?t:l(t,"owner.json"),e=JSON.parse(P(r,"utf-8"));return typeof e.transaction_id=="string"&&typeof e.pending_file=="string"?e:null}catch{return null}}function ot(t){if(!t||!d(t.pending_file))return!1;try{return JSON.parse(P(t.pending_file,"utf-8")).transaction_id===t.transaction_id}catch{return!0}}function Wt(t){const r=p();if(!r?.transaction_id)throw new f("PENDING_MISSING","Upgrade transaction disappeared before npm staging");const e=B(t),n={transaction_id:r.transaction_id,pending_file:y()};x({npm_prefix:s(t),npm_lock_file:e},r.transaction_id);const i=`${e}.candidate-${r.transaction_id}-${X()}`;try{D(i,JSON.stringify(n),{encoding:"utf-8",flag:"wx"}),kt(i,e),g(i,{force:!0})}catch(a){try{g(i,{force:!0})}catch{}if(!d(e))throw a;const o=Y(e);if(o?.transaction_id===r.transaction_id&&s(o.pending_file)===s(y()))return;throw new f(ot(o)?"UPGRADE_IN_PROGRESS":"UPGRADE_LOCK_RECOVERY_REQUIRED",ot(o)?`Another Windows service root is upgrading the shared npm prefix ${s(t)}`:`A stale or incomplete Windows upgrade lock requires recovery at ${e}`)}}function Vt(t=p(),r={}){if(!t?.transaction_id||!t.npm_prefix||!t.npm_lock_file)return!0;const e=B(t.npm_prefix);if(s(t.npm_lock_file)!==e)return!1;if(!d(e))return!0;const n=Y(e);if(!n)return!1;if(n.transaction_id!==t.transaction_id||s(n.pending_file)!==s(y()))return!0;const i=r.remove??g,a=r.sleep??(o=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,o)});for(let o=0;;o+=1)try{return i(e,{recursive:!0,force:!0}),!d(e)}catch(c){const u=c?.code;if((u==="EBUSY"||u==="EPERM"||u==="EACCES")&&o<U.length){a(U[o]);continue}return _(`shared npm-prefix lock release failed at ${e}: ${c instanceof Error?c.message:String(c)}`),!1}}function L(t,r){const e=s(t);return s(r)===`${e}${W}`&&e.includes(`${N}node_modules${N}`)&&I(e)==="grix-connector"}function Bt(t,r){const e=q(s(t),s(r));return e!==""&&e!==".."&&!e.startsWith(`..${N}`)}function H(t){if(!t?.npm_prefix||!t.staging_prefix||!t.staged_package_dir)return!1;const r=s(t.npm_prefix),e=s(t.staging_prefix),n=s(t.staged_package_dir);return m(e)===r&&I(e).startsWith(".grix-upgrade-stage-")&&Bt(e,n)&&I(m(n))==="node_modules"&&I(n)==="grix-connector"}function Yt(t,r){const e=p();!e||!L(t,r)||x({package_dir:s(t),backup_dir:s(r)},e.transaction_id)}function Ht(t){if(!L(t.packageDir,t.backupDir))throw new f("UNSAFE_UPGRADE_PATH","Refusing to record an unsafe global package path");if(!H({npm_prefix:t.npmPrefix,staging_prefix:t.stagingPrefix,staged_package_dir:t.stagedPackageDir}))throw new f("UNSAFE_UPGRADE_PATH","Refusing to record an unsafe npm staging path");const r=p();if(!r)throw new f("PENDING_MISSING","Upgrade transaction disappeared during staging");let e;try{const n=JSON.parse(P(l(t.packageDir,"package.json"),"utf-8"));if(n.name!=="grix-connector"||typeof n.version!="string")throw new Error("invalid metadata");e=G(n.version)}catch(n){throw new f("VERSION_VERIFY_FAILED",`Unable to identify the active global package before staging: ${n instanceof Error?n.message:String(n)}`)}x({phase:"staged",activation_strategy:t.activationStrategy,package_from_version:e,npm_prefix:s(t.npmPrefix),package_dir:s(t.packageDir),backup_dir:s(t.backupDir),staged_package_dir:s(t.stagedPackageDir),staging_prefix:s(t.stagingPrefix)},r.transaction_id)}function jt(t,r,e={}){const n=p();if(!n?.transaction_id)throw new f("PENDING_MISSING","Upgrade transaction disappeared before runtime staging");const i=Z($.base),a=`${i}${tt}`,o=`${i}${rt}`;x({runtime_dir:i,runtime_backup_dir:a,runtime_next_dir:o},n.transaction_id);const c=e.copyTree??yt,u=e.copyFile??St,k=e.sleep??(v=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,v)});for(let v=0;;v+=1)try{S(m(i),{recursive:!0}),g(o,{recursive:!0,force:!0}),S(o,{recursive:!0}),c(l(t.stagedPackageDir,"dist"),l(o,"dist"),{recursive:!0,force:!0}),u(l(t.stagedPackageDir,"package.json"),l(o,"package.json"));const w=l(t.stagedPackageDir,"node_modules");d(w)&&c(w,l(o,"node_modules"),{recursive:!0,force:!0});const E=M(o,"grix-connector",r);O(o,E);return}catch(w){try{g(o,{recursive:!0,force:!0})}catch{}const E=w?.code;if(E==="ENOSPC")throw new f("DISK_FULL",`Insufficient space for the isolated Windows runtime: ${w.message}`);if((E==="EBUSY"||E==="EPERM"||E==="EACCES"||E==="ENOTEMPTY")&&v<et.length){k(et[v]);continue}throw new f("RUNTIME_STAGE_FAILED",`Could not prepare the isolated Windows runtime before shutdown: ${w instanceof Error?w.message:String(w)}`)}}function T(t,r){if(!d(t))return!0;const e=r.remove??g,n=r.sleep??(i=>{Atomics.wait(new Int32Array(new SharedArrayBuffer(4)),0,0,i)});for(let i=0;;i+=1)try{if(e(t,{recursive:!0,force:!0}),!d(t))return!0;throw Object.assign(new Error(`path still exists after removal: ${t}`),{code:"EBUSY"})}catch(a){const o=a?.code;if((o==="EBUSY"||o==="EPERM"||o==="EACCES"||o==="ENOTEMPTY")&&i<U.length){n(U[i]);continue}return _(`upgrade artifact cleanup failed at ${t}: ${a instanceof Error?a.message:String(a)}`),!1}}function wr(t=p(),r={}){if(t?.transaction_id&&p()?.transaction_id!==t.transaction_id)return!1;let e=!0,n=process.platform!=="win32";if(t?.npm_lock_file||t?.npm_prefix){if(!t.transaction_id||!t.npm_lock_file||!t.npm_prefix)return!1;const o=B(t.npm_prefix);if(s(t.npm_lock_file)!==o)return!1;if(d(o)){const c=Y(o);if(c?.transaction_id!==t.transaction_id||s(c.pending_file)!==s(y()))return!1;n=!0}else{if(t.backup_dir&&d(t.backup_dir))return!1;n=!1}}const i=t?.package_dir,a=t?.backup_dir;return n&&i&&a&&L(i,a)&&(e=T(a,r)&&e),H(t)&&(e=T(s(t.staging_prefix),r)&&e),it(t)&&(e=T(s(t.runtime_backup_dir),r)&&e,e=T(s(t.runtime_next_dir),r)&&e),e}function Sr(t=p()){const r=t?.package_dir,e=t?.backup_dir;if(!r||!e||!L(r,e)||!d(e))return!1;const n=`${r}${Ft}`;try{return g(n,{recursive:!0,force:!0}),d(r)&&h(r,n),h(e,r),g(n,{recursive:!0,force:!0}),_(`atomic rollback restored ${r}`),!0}catch(i){try{!d(r)&&d(n)&&h(n,r)}catch{}return _(`atomic rollback failed: ${i instanceof Error?i.message:String(i)}`),!1}}function at(t,r={}){const e=y();if(t){const n=p();if(!n)return!0;if(n.transaction_id!==t)return!1}if(d(e))try{(r.unlink??C)(e)}catch{return!1}return!d(e)}function yr(t=p(),r={}){if(!t?.transaction_id)return at(void 0,{unlink:r.unlinkPending});const e=p();if(e?.transaction_id!==t.transaction_id)return!1;const n=e.phase==="finalizing"?e:x({phase:"finalizing"},t.transaction_id);return Vt(n,{remove:r.removeLock,sleep:r.sleep})?at(t.transaction_id,{unlink:r.unlinkPending}):!1}function _(t){const r=`[${new Date().toISOString()}] ${t}
|
|
2
|
+
`;try{xt(nt(),r)}catch{}}function kr(t=4096){const r=nt();if(!d(r))return"";try{const e=P(r,"utf-8");return e.length<=t?e:e.slice(-t)}catch{return""}}function ct(){try{const t=F(["--version"]);return b(t.command,t.args,{encoding:"utf-8",timeout:1e4,windowsHide:!0}).trim()}catch{throw new f("NPM_NOT_FOUND","npm is not available or timed out")}}const R=1e6;function st(){let t;try{t=j(["prefix","-g"])}catch{return R}try{const r=It(t),e=Math.floor(Number(r.bavail)*Number(r.bsize)/(1024*1024));return!Number.isFinite(e)||e<0?R:Math.min(e,R)}catch{return R}}function Er(){let t;try{t=ct()}catch(e){return{ok:!1,errorCode:"NPM_NOT_FOUND",errorMsg:e instanceof Error?e.message:"npm not available"}}const r=st();return r<100?{ok:!1,errorCode:"DISK_FULL",errorMsg:`Only ${r}MB free disk space (need >= 100MB)`,npmVersion:t,diskFreeMb:r}:{ok:!0,npmVersion:t,diskFreeMb:r}}function Pr(){let t="";try{t=ct()}catch{}let r=R;try{r=st()}catch{}return{npm_version:t,node_version:process.version,disk_free_mb:r,platform:process.platform,arch:process.arch,host_name:Dt(),install_id:$t()}}function M(t,r,e){const n=l(t,"package.json");let i;try{i=JSON.parse(P(n,"utf-8"))}catch{throw new f("VERSION_VERIFY_FAILED",`Unable to read staged package metadata: ${n}`)}if(i.name!==r||i.version?.replace(/^v(?=\d)/,"")!==e)throw new f("VERSION_MISMATCH",`Staged package ${String(i.name)}@${String(i.version)} does not match ${r}@${e}`);return i}function Jt(t){return typeof t.bin=="string"?[[I(t.name),t.bin]]:!t.bin||typeof t.bin!="object"?[]:Object.entries(t.bin).filter(r=>typeof r[1]=="string")}function O(t,r){const e=Jt(r);if(e.length===0)throw new f("VERSION_VERIFY_FAILED",`Staged package ${r.name} has no executable bin`);for(const[,n]of e){const i=l(t,n);if(!d(i))throw new f("VERSION_VERIFY_FAILED",`Staged package entrypoint is missing: ${i}`)}return e}function zt(t,r,e){if(process.platform==="win32")return;const n=l(t,"bin");S(n,{recursive:!0});for(const[i,a]of e){const o=l(n,i);if(d(o))continue;const c=`${o}.grix-upgrade-${process.pid}`;try{C(c)}catch{}vt(q(n,l(r,a)),c),h(c,o)}}function Kt(t){const r=s(t.activePackageDir),e=s(t.stagedPackageDir),n=`${r}${W}`,i=M(e,t.packageName,t.version),a=O(e,i);d(n)&&(d(r)?g(n,{recursive:!0,force:!0}):h(n,r)),Yt(r,n);let o=!1;try{d(r)&&(h(r,n),o=!0),h(e,r);const c=M(r,t.packageName,t.version),u=O(r,c);return zt(t.npmPrefix,r,u),{packageDir:r,backupDir:n}}catch(c){try{d(r)&&g(r,{recursive:!0,force:!0}),o&&d(n)&&h(n,r)}catch{}throw c}}function j(t,r=1e4){try{const e=F(t);return b(e.command,e.args,{encoding:"utf-8",timeout:r,windowsHide:!0}).trim()}catch{throw new f("NPM_NOT_FOUND",`Unable to resolve npm ${t.join(" ")}`)}}function J(t){return j(t)}const ut=Nt.find(t=>t.id==="official")?.url??"https://registry.npmjs.org";async function Xt(t,r,e){const n=["view",`${t}@${r}`,"dist.integrity","--registry",e,"--no-audit","--no-fund"],i=F(n),{stdout:a}=await Q(i.command,i.args,{timeout:1e4,windowsHide:!0});return a.trim()}async function qt(t,r,e,n={}){if(!e)return;let i;try{i=new URL(e).origin}catch{return}if(i===new URL(ut).origin)return;const a=n.fetchIntegrity??Xt;let o;try{o=await a(t,r,ut)}catch(u){_(`integrity cross-check skipped: official registry unreachable (${u instanceof Error?u.message:String(u)})`);return}if(!o){_("integrity cross-check skipped: official registry returned no dist.integrity");return}let c;try{c=await a(t,r,e)}catch(u){_(`integrity cross-check skipped: mirror metadata unreadable (${u instanceof Error?u.message:String(u)})`);return}if(!c){_("integrity cross-check skipped: mirror returned no dist.integrity");return}if(c!==o)throw new f("INTEGRITY_MISMATCH",`Mirror ${e} reports dist.integrity ${c} but official npm reports ${o} for ${t}@${r}`);_(`integrity cross-check passed for ${t}@${r} via ${e}`)}async function ft(t,r,e,n={},i=process.platform==="win32"?"staged":"atomic"){const a=`${t}@${r}`,o=J(["prefix","-g"]),c=J(["root","-g"]);S(o,{recursive:!0}),i==="staged"&&Wt(o);const u=Et(l(o,".grix-upgrade-stage-"));try{_(`staging npm install ${a} under ${u}`);const k=n.installWithMirror??Rt,{registry:v,registryUrl:w}=await k(a,e,10*1024*1024,{prefix:u,...i==="staged"?{env:{...process.env,GRIX_UPGRADE_STAGING:"1"}}:{}});await(n.verifyIntegrityConsensus??qt)(t,r,w);const dt=J(["root","-g","--prefix",u]),A=l(dt,t),lt=M(A,t,r),pt=O(A,lt),gt=l(A,pt[0][1]),z=b(process.execPath,[gt,"--version"],{encoding:"utf-8",timeout:15e3,maxBuffer:2*1024*1024,windowsHide:!0}).trim().replace(/^v(?=\d)/,"");if(z!==r)throw new f("VERSION_MISMATCH",`Staged CLI reported ${z||"<empty>"}, expected ${r}`);const K=l(c,t);return{npmPrefix:o,packageDir:K,backupDir:`${s(K)}${W}`,stagedPackageDir:A,stagingPrefix:u,registry:v}}catch(k){try{g(u,{recursive:!0,force:!0})}catch{}throw k}}async function Zt(t,r,e,n){const i=await ft(t,r,e,n,"atomic");try{const a=Kt({packageName:t,version:r,npmPrefix:i.npmPrefix,activePackageDir:i.packageDir,stagedPackageDir:i.stagedPackageDir});_(`atomic package switch succeeded via ${i.registry}; backup=${a.backupDir}`)}finally{try{g(i.stagingPrefix,{recursive:!0,force:!0})}catch{}}}async function Ir(t,r,e=12e4,n={}){r=G(r);const i=p()?.transaction_id,a=`${t}@${r}`,o=n.activationMode??(process.platform==="win32"?"staged":"atomic");_(`npm install -g ${a} starting (${o} staging with mirror fallback)`);try{if(o==="staged"){const c=await ft(t,r,e,n,o);try{Ht({...c,activationStrategy:process.platform==="win32"?"wrapper-runtime":"service-start"}),process.platform==="win32"&&jt(c,r)}catch(u){try{g(c.stagingPrefix,{recursive:!0,force:!0})}catch{}throw u}return _(`staged package verified via ${c.registry}; waiting for guardian activation`),{activationRequired:!0,packageDir:c.packageDir,backupDir:c.backupDir,stagedPackageDir:c.stagedPackageDir,stagingPrefix:c.stagingPrefix}}else return await Zt(t,r,e,n),{activationRequired:!1}}catch(c){if(o==="staged"){const k=p();i&&k?.transaction_id===i&&Gt(k)}if(c instanceof f)throw c;const u=c instanceof Error?c.message:String(c);throw _(`npm install failed: ${u}`),/timed out|ETIMEDOUT/i.test(u)?new f("NPM_TIMEOUT",`npm install timed out after ${e/1e3}s (tried all mirrors): ${u}`):u.includes("EACCES")||u.includes("permission denied")?new f("NPM_INSTALL_FAILED",`Permission denied: ${u}`):u.includes("ENOSPC")||u.includes("no space left")?new f("DISK_FULL",`Disk full: ${u}`):u.includes("404")||u.includes("not found")?new f("NPM_INSTALL_FAILED",`Package not found: ${u}`):new f("NPM_INSTALL_FAILED",u)}}function vr(t){let r;try{r=j(["root","-g"])}catch{throw new f("VERSION_VERIFY_FAILED","Unable to resolve the global npm package directory")}let e;try{const n=l(r,"grix-connector","package.json"),i=JSON.parse(P(n,"utf-8"));if(i.name!=="grix-connector"||typeof i.version!="string"||!i.version.trim())throw new Error("invalid package metadata");e=i.version.trim().replace(/^v(?=\d)/,"")}catch{throw new f("VERSION_VERIFY_FAILED","Unable to read the installed grix-connector version")}if(e!==t)throw new f("VERSION_MISMATCH",`Installed version ${e} does not match expected ${t}`);return e}async function xr(t,r){r=G(r);let e=!1;for(const n of await At())try{const i=["view",`${t}@${r}`,"version","--registry",n.url,"--no-audit","--no-fund"],a=F(i),{stdout:o}=await Q(a.command,a.args,{timeout:8e3,windowsHide:!0});if(o.trim())return!0}catch(i){const a=i,o=a.stderr||a.message||String(i);/ETARGET|No matching version|notarget|E404/i.test(o)&&(e=!0)}return!e}export{f as UpgradeError,Wt as acquireNpmPrefixUpgradeLock,_r as armWindowsUpgradeHandoff,mr as armWindowsUpgradeRollback,st as checkDiskSpace,ct as checkNpmAvailable,wr as cleanupPendingBackup,Pr as collectEnvInfo,Kt as commitStagedGlobalPackage,Gt as discardPendingStaging,yr as finalizePendingTransaction,kr as getUpgradeLogTail,xr as isVersionAvailable,G as normalizeUpgradeVersion,Ir as npmInstall,lr as pendingExists,Er as preflightCheck,jt as prepareStagedWindowsRuntime,p as readPending,gr as readPendingPackageVersion,Vt as releasePendingUpgradeLock,at as removePending,hr as removeWindowsHandoffFiles,Sr as rollbackPendingInstall,x as updatePending,_ as upgradeLog,dr as upgradeStatusSnapshot,vr as verifyInstalledVersion,qt as verifyMirrorIntegrityConsensus,Ot as windowsRollbackIntentPath,V as windowsWrapperPausePath,pr as writePending,Mt as writePendingData};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{existsSync as g,mkdirSync as M,readFileSync as v,renameSync as C,writeFileSync as R}from"node:fs";import{join as h,dirname as O}from"node:path";import{spawn as L}from"node:child_process";import{log as l}from"../log/index.js";import{GRIX_PATHS as m}from"../log/index.js";import{resolveClientVersion as _}from"../util/client-version.js";import{UpgradeError as D,cleanupPendingBackup as w,collectEnvInfo as N,getUpgradeLogTail as x,isVersionAvailable as F,npmInstall as H,pendingExists as T,preflightCheck as V,readPending as B,readPendingPackageVersion as z,removePending as p,rollbackPendingInstall as G,upgradeLog as s,verifyInstalledVersion as j,writePending as K}from"./npm-upgrader.js";import{isRetriableRegistryError as X}from"../installer/npm-registry.js";const q=360*60*1e3,J=300*1e3,k=1800*1e3,W=2,Y=3,S="grix-connector",A=1e4,b=15,Z=2e3,Q=8e3,tt=1e3,P=600*1e3;function et(o){const t=Date.parse(o.upgraded_at??"");return Number.isNaN(t)?!0:Date.now()-t>P}function I(o){return new URL(o.replace(/^wss:/,"https:").replace(/^ws:/,"http:")).origin}function E(){return h(m.data,"upgrade-state.json")}function $(){const o=E();if(!g(o))return{daily_attempts:{},version_attempts:{}};try{return JSON.parse(v(o,"utf-8"))}catch{return{daily_attempts:{},version_attempts:{}}}}function rt(o){const t=E();M(O(t),{recursive:!0});const e=t+".tmp";R(e,JSON.stringify(o),"utf-8"),C(e,t)}function U(){return new Date().toISOString().slice(0,10)}class dt{agentConfigs;isBusy;closeAdmission;timer=null;initialTimer=null;running=!1;stopped=!1;constructor(t,e,i){this.agentConfigs=t,this.isBusy=e,this.closeAdmission=i}async start(){await this.handlePendingOnStartup(),this.initialTimer=setTimeout(()=>{this.stopped||(this.runCheck(),!this.stopped&&(this.timer=setInterval(()=>this.runCheck(),q)))},J)}stop(){this.stopped=!0,this.initialTimer&&(clearTimeout(this.initialTimer),this.initialTimer=null),this.timer&&(clearInterval(this.timer),this.timer=null)}triggerCheck(){this.stopped||this.runCheck()}async checkForUpdate(){return this.agentConfigs.length===0?{available:!1}:(await Promise.all(this.agentConfigs.map(i=>this.queryUpgrade(i)))).find(i=>i.available&&i.release)??{available:!1}}async handlePendingOnStartup(){if(!T())return;const t=B();if(!t){p();return}const e=z(t),i=_(),r=!e||e===t.target_version,a=i===t.target_version&&r;if(!a&&r){if(!et(t)){s(`daemon startup: runtime ${i} is waiting for guardian activation of ${t.target_version} (active package=${e??"unknown"})`);return}s(`daemon startup: activation wait for ${t.target_version} expired (> ${P/6e4}min); no guardian will finish the switch, reporting by version verdict`)}const c=a?{from_version:t.from_version,to_version:t.target_version,status:"success"}:{from_version:t.from_version,to_version:t.target_version,status:"rolled_back",error_code:"STARTUP_CRASH",crash_count:t.crash_count};if(s(a?`daemon startup: version matches target ${t.target_version}, upgrade succeeded`:`daemon startup: runtime=${i}, active package=${e??"unknown"}, target=${t.target_version}; rolled back`),a){const u=await this.confirmHealthz(Q);s(u?"healthz confirmed healthy, reporting success":"healthz not confirmed within window; reporting success on version-match (guardian still guards crashes)")}if(await this.reportUpgrade(c)){a&&w(t),p();return}this.retryStartupReport(c,a?t:null)}async retryStartupReport(t,e){for(let i=2;i<=b;i++){if(this.stopped)return;const r=Z*(i-1)+Math.floor(Math.random()*1e3);if(await new Promise(a=>setTimeout(a,r)),this.stopped)return;if(await this.reportUpgrade(t)){w(e),p();return}}s(`startup report (${t.status}) not delivered after ${b} attempts; clearing pending to unblock future checks`),w(e),p()}async confirmHealthz(t){let e="19579";try{const a=h(m.data,"health-port");g(a)&&(e=v(a,"utf-8").trim()||e)}catch{}const i=`http://127.0.0.1:${e}/healthz`,r=Date.now()+t;for(;Date.now()<r&&!this.stopped;){try{if((await fetch(i,{signal:AbortSignal.timeout(2e3)})).ok)return!0}catch{}await new Promise(a=>setTimeout(a,tt))}return!1}async runCheck(){if(!this.running){this.running=!0;try{await this.check()}catch(t){l.error("upgrade",`Check failed: ${t instanceof Error?t.message:t}`)}finally{this.running=!1}}}async check(){if(T()||this.agentConfigs.length===0)return;const i=(await Promise.all(this.agentConfigs.map(n=>this.queryUpgrade(n)))).find(n=>n.available&&n.release)?.release;if(!i)return;const r=i.version,a=_();if(!i.force&&!this.checkRateLimit(r))return;const u=V();if(!u.ok){await this.reportUpgrade({from_version:a,to_version:r,status:"failed",error_code:u.errorCode,error_msg:u.errorMsg});return}if(!await F(S,r)){s(`target ${r} not resolvable on any registry yet; skipping this cycle (no failure recorded)`);return}s(`upgrade start: ${a} -> ${r}`);const y=Date.now();try{if(K(a,r),await H(S,r),j(r),s("npm install verified, reporting installed"),await this.reportUpgrade({from_version:a,to_version:r,status:"installed",duration_ms:Date.now()-y}),s("shutting down for restart"),!await this.waitUntilIdle()){s("upgrade aborted: checker stopped during wait");return}this.startGuardian(),process.kill(process.pid,"SIGTERM")}catch(n){const d=n instanceof D?n.code:"NPM_INSTALL_FAILED",f=n instanceof Error?n.message:String(n);s(`upgrade failed: ${d} ${f}`),G()&&s("upgrade failed before restart; previous package restored atomically"),p(),X(f)||d==="NPM_TIMEOUT"?s(`failure is retriable (${d}); skipping cooldown, will retry next cycle`):this.recordFailure(r),await this.reportUpgrade({from_version:a,to_version:r,status:"failed",error_code:d,error_msg:f,duration_ms:Date.now()-y,upgrade_log:x()})}}async waitUntilIdle(){if(this.closeAdmission?.(),!this.isBusy?.())return!this.stopped;s("active tasks detected, waiting until idle before restart (no max wait)");const t=5e3,e=600*1e3;let i=Date.now();for(;this.isBusy()&&!this.stopped;)await new Promise(r=>setTimeout(r,t)),Date.now()-i>=e&&(i=Date.now(),s("still waiting for active tasks to finish before restart"));return this.stopped?!1:(s("all tasks completed, proceeding with restart"),!0)}checkRateLimit(t){const e=$();if(e.last_failure_at){const c=Date.now()-new Date(e.last_failure_at).getTime();if(c<k)return l.info("upgrade",`In cooldown, ${(k-c)/6e4}m remaining`),!1}const i=e.version_attempts[t]??0;if(i>=Y)return l.info("upgrade",`Version ${t} already tried ${i} times, skipping`),!1;const r=U(),a=e.daily_attempts[r]??0;return a>=W?(l.info("upgrade",`Already ${a} attempts today, skipping`),!1):!0}recordFailure(t){const e=$(),i=U();e.last_failure_at=new Date().toISOString(),e.last_failure_version=t,e.daily_attempts[i]=(e.daily_attempts[i]??0)+1,e.version_attempts[t]=(e.version_attempts[t]??0)+1,rt(e)}async queryUpgrade(t){const i=`${I(t.wsUrl)}/v1/agent-api/upgrade/check?`+new URLSearchParams({client_type:"grix-connector",client_version:_(),channel:t.channel??"stable",platform:process.platform,arch:process.arch}).toString();try{const r=await fetch(i,{headers:{Authorization:`Bearer ${t.apiKey}`},signal:AbortSignal.timeout(A)});if(!r.ok)return l.warn("upgrade",`Check API returned ${r.status}`),{available:!1};const a=await r.json();return a.code!==0?{available:!1}:a.data}catch(r){return l.warn("upgrade",`Check API error: ${r instanceof Error?r.message:r}`),{available:!1}}}async reportUpgrade(t){if(this.agentConfigs.length===0)return!1;const e={client_type:"grix-connector",...t.npm_version?t:{...t,...N()}};return(await Promise.all(this.agentConfigs.map(async r=>{const c=`${I(r.wsUrl)}/v1/agent-api/upgrade/report`;try{return(await fetch(c,{method:"POST",headers:{Authorization:`Bearer ${r.apiKey}`,"Content-Type":"application/json"},body:JSON.stringify(e),signal:AbortSignal.timeout(A)})).ok}catch{return!1}}))).some(r=>r)}startGuardian(){const t=h(m.base,"bin","upgrade-guardian.sh");if(process.platform==="win32"||!g(t)){l.info("upgrade","Guardian not available on this platform, skipping");return}try{const e=L(t,[],{detached:!0,stdio:"ignore"});e.unref(),s(`guardian started (pid ${e.pid})`)}catch(e){l.warn("upgrade",`Failed to start guardian: ${e instanceof Error?e.message:e}`)}}}export{dt as UpgradeChecker};
|
|
1
|
+
import{existsSync as v,mkdirSync as z,readFileSync as A,renameSync as K,writeFileSync as X}from"node:fs";import{join as g,dirname as J}from"node:path";import{spawn as I}from"node:child_process";import{log as f}from"../log/index.js";import{GRIX_PATHS as m}from"../log/index.js";import{resolveClientVersion as R}from"../util/client-version.js";import{UpgradeError as P,armWindowsUpgradeHandoff as D,armWindowsUpgradeRollback as Y,cleanupPendingBackup as U,collectEnvInfo as Z,discardPendingStaging as N,finalizePendingTransaction as T,getUpgradeLogTail as Q,isVersionAvailable as ee,npmInstall as te,normalizeUpgradeVersion as re,pendingExists as $,preflightCheck as ae,readPending as k,readPendingPackageVersion as ie,removeWindowsHandoffFiles as ne,rollbackPendingInstall as se,updatePending as E,upgradeLog as n,verifyInstalledVersion as oe,writePending as ce}from"./npm-upgrader.js";import{isRetriableRegistryError as de,isTransientInstallError as le}from"../installer/npm-registry.js";const ue=360*60*1e3,pe=300*1e3,O=1800*1e3,he=2,fe=3,ge=10,G="grix-connector",M=1e4,W=15,_e=2e3,me=8e3,we=1e3,ve=2e3,ye=120*1e3,C=1e4,Se=6e4,be=3,Ae=600*1e3,Pe=new Set(["preparing","staged","handoff_ready","activating","verifying","healthy","rolling_back","rolled_back","finalizing","failed"]),L=600*1e3;function x(s,e=L){const t=Date.parse(s.activation_started_at??s.upgraded_at??"");return Number.isNaN(t)?!0:Date.now()-t>e}function q(s){const e=Date.parse(s.verification_started_at??s.activation_started_at??"");return Number.isNaN(e)||Date.now()-e>ye}function Te(s){if((s.guardian_handback_count??0)>=be)return!1;const e=Date.parse(s.guardian_handback_at??"");return Number.isNaN(e)?!0:Date.now()-e>=Ae}function Re(s){if(!Number.isInteger(s)||(s??0)<=0)return!1;try{return process.kill(s,0),!0}catch{return!1}}function b(){const s=g(m.base,"bin"),e=g(s,"upgrade-guardian.mjs");if(v(e))return e;const t=g(s,"upgrade-guardian.fallback.mjs");return v(t)?t:null}function V(s){if(!Re(s.guardian_pid))return!1;try{const t=JSON.parse(A(g(m.data,"upgrade-monitor-heartbeat.json"),"utf-8"));if(t.transaction_id===s.transaction_id&&t.pid===s.guardian_pid&&typeof t.updated_at=="number"&&Date.now()-t.updated_at<=C)return!0}catch{}const e=Date.parse(s.guardian_started_at??"");return Number.isFinite(e)&&Date.now()-e<=C}function H(s){return new URL(s.replace(/^wss:/,"https:").replace(/^ws:/,"http:")).origin}function B(){return g(m.data,"upgrade-state.json")}function F(){const s=B();if(!v(s))return{daily_attempts:{},version_attempts:{}};try{return JSON.parse(A(s,"utf-8"))}catch{return{daily_attempts:{},version_attempts:{}}}}function ke(s){const e=B();z(J(e),{recursive:!0});const t=e+".tmp";X(t,JSON.stringify(s),"utf-8"),K(t,e)}function j(){return new Date().toISOString().slice(0,10)}class Ce{agentConfigs;isBusy;closeAdmission;options;timer=null;initialTimer=null;pendingTimer=null;guardianWaitLoggedAt=0;guardianWaitLoggedPhase="";recordedRollbackFailures=new Set;posixGuardianResumeAttempted=new Set;running=!1;stopped=!1;constructor(e,t,i,r={}){this.agentConfigs=e,this.isBusy=t,this.closeAdmission=i,this.options=r}async start(){await this.handlePendingOnStartup(),this.initialTimer=setTimeout(()=>{this.stopped||(this.runCheck(),!this.stopped&&(this.timer=setInterval(()=>this.runCheck(),ue)))},pe)}stop(){this.stopped=!0,this.initialTimer&&(clearTimeout(this.initialTimer),this.initialTimer=null),this.timer&&(clearInterval(this.timer),this.timer=null),this.pendingTimer&&(clearTimeout(this.pendingTimer),this.pendingTimer=null)}triggerCheck(){this.stopped||this.runCheck()}async checkForUpdate(){return this.agentConfigs.length===0?{available:!1}:(await Promise.all(this.agentConfigs.map(i=>this.queryUpgrade(i)))).find(i=>i.available&&i.release)??{available:!1}}async handlePendingOnStartup(){if(!$())return;let e=k();if(!e){n("daemon startup: pending journal is unreadable; preserving it and blocking automatic upgrade for manual recovery");return}if(e.phase&&!Pe.has(e.phase)&&(e=E({phase:"failed",error_code:"INVALID_UPGRADE_STATE",error_msg:`Unknown upgrade transaction phase: ${String(e.phase)}`},e.transaction_id)),e.phase==="finalizing"){T(e)||(n(`terminal transaction ${e.transaction_id??"legacy"} is waiting for its shared lock to be released`),this.schedulePendingReconcile());return}if(e.phase==="preparing"||e.phase==="staged"){const o=!!(e.wrapper_pause_file&&v(e.wrapper_pause_file));if(e.phase==="staged"&&o){this.schedulePendingReconcile();return}N(e),e=E({phase:"rolled_back",error_code:"UPGRADE_INTERRUPTED",error_msg:"Upgrade stopped before Windows activation started"})}if(e.phase==="verifying"){if(V(e)&&!q(e)){this.schedulePendingReconcile();return}if(q(e)&&e.transaction_id&&["win32","darwin"].includes(this.options.platform??process.platform)&&this.options.requestGracefulShutdown){const o=`Target ${e.target_version} did not become healthy before the Windows verification deadline`;Y(e.transaction_id,o),n(`${o}; requesting graceful shutdown for offline rollback`),await this.options.requestGracefulShutdown("upgrade");return}await this.resumeWindowsGuardian(),this.schedulePendingReconcile();return}const t=new Set(["handoff_ready","activating","rolling_back"]);if(e.phase&&t.has(e.phase)){if(V(e)){this.logGuardianWait(e),this.schedulePendingReconcile();return}if(x(e)&&e.transaction_id&&(this.options.platform??process.platform)==="win32"&&this.options.requestGracefulShutdown&&Te(e)){const o=`Guardian did not settle ${e.phase} for ${e.target_version} before the Windows activation deadline`;E({guardian_handback_count:(e.guardian_handback_count??0)+1,guardian_handback_at:new Date().toISOString()},e.transaction_id),n(`${o}; requesting graceful shutdown so the wrapper re-runs the guardian`),await this.options.requestGracefulShutdown("upgrade");return}await this.resumeWindowsGuardian(),this.logGuardianWait(e),this.schedulePendingReconcile();return}if(e.phase==="failed"){n(`daemon startup: upgrade transaction requires manual recovery: ${e.error_msg??e.error_code??"unknown error"}`);return}const i=ie(e),r=R(),a=e.phase==="healthy",c=e.phase==="rolled_back",p=!i||i===e.target_version,d=a?r===e.target_version&&i===e.target_version:!c&&r===e.target_version&&p;if(!d&&p&&!c){if(!x(e)){if((this.options.platform??process.platform)!=="win32"&&i===e.target_version){const o=e.transaction_id??`${e.target_version}@${e.upgraded_at}`;this.posixGuardianResumeAttempted.has(o)||(this.posixGuardianResumeAttempted.add(o),n(`resuming POSIX guardian for stalled activation of ${e.target_version}`),this.startGuardian())}this.logThrottled("posix-activation-wait",`daemon startup: runtime ${r} is waiting for guardian activation of ${e.target_version} (active package=${i??"unknown"})`),this.schedulePendingReconcile();return}n(`daemon startup: activation wait for ${e.target_version} expired (> ${L/6e4}min); no guardian will finish the switch, reporting by version verdict`)}const u=d?{from_version:e.from_version,to_version:e.target_version,status:"success"}:{from_version:e.from_version,to_version:e.target_version,status:"rolled_back",error_code:e.error_code??"STARTUP_CRASH",error_msg:e.error_msg,crash_count:e.crash_count};if(n(d?`daemon startup: version matches target ${e.target_version}, upgrade succeeded`:`daemon startup: runtime=${r}, active package=${i??"unknown"}, target=${e.target_version}; rolled back`),!d){const o=e.transaction_id??`${e.target_version}@${e.upgraded_at}`;this.recordedRollbackFailures.has(o)||(this.recordedRollbackFailures.add(o),this.recordFailure(e.target_version))}if(d){const o=await this.confirmHealthz(me,a?e.target_version:void 0,a?e.old_pid:void 0,a?e.activation_started_at:void 0);if(a&&!o){n("guardian marked healthy but target-version healthz is not yet observable; retrying reconciliation"),this.schedulePendingReconcile();return}n(o?"healthz confirmed healthy, reporting success":"healthz not confirmed within window; reporting success on version-match (guardian still guards crashes)")}if(!U(e)){n(`terminal transaction ${e.transaction_id??"legacy"} is waiting for antivirus-held artifact cleanup`),this.schedulePendingReconcile();return}if(await this.reportUpgrade(u)){T(e)||(n(`terminal transaction ${e.transaction_id??"legacy"} could not release its shared lock; retrying reconciliation`),this.schedulePendingReconcile());return}this.retryStartupReport(u,e,!1)}schedulePendingReconcile(){this.stopped||this.pendingTimer||(this.pendingTimer=setTimeout(()=>{this.pendingTimer=null,!this.stopped&&this.handlePendingOnStartup().catch(e=>{f.warn("upgrade",`Pending reconciliation failed: ${e instanceof Error?e.message:e}`),this.schedulePendingReconcile()})},ve))}logThrottled(e,t){const i=Date.now();e===this.guardianWaitLoggedPhase&&i-this.guardianWaitLoggedAt<Se||(this.guardianWaitLoggedPhase=e,this.guardianWaitLoggedAt=i,n(t))}logGuardianWait(e){const t=String(e.phase??"");this.logThrottled(`guardian:${t}`,`transaction ${e.transaction_id??"legacy"} is ${t}; waiting for guardian verdict`)}async resumeWindowsGuardian(){if(this.options.resumeWindowsGuardian){await this.options.resumeWindowsGuardian();return}const e=b();if(!e)return;I(process.execPath,[e,"activate","--root",m.base],{detached:!0,stdio:"ignore",windowsHide:!0}).unref()}async retryStartupReport(e,t,i){const r=t?.transaction_id,a=()=>{const c=k();if(!(r&&c?.transaction_id!==r)){if(i&&!U(t)){n(`terminal backup cleanup is still blocked for ${r??"legacy transaction"}`),this.schedulePendingReconcile();return}T(t)||(n(`terminal shared lock release is still blocked for ${r??"legacy transaction"}`),this.schedulePendingReconcile())}};for(let c=2;c<=W;c++){if(this.stopped)return;const p=_e*(c-1)+Math.floor(Math.random()*1e3);if(await new Promise(d=>setTimeout(d,p)),this.stopped)return;if(await this.reportUpgrade(e)){a();return}}n(`startup report (${e.status}) not delivered after ${W} attempts; clearing pending to unblock future checks`),a()}async confirmHealthz(e,t,i,r){let a="19579";try{const d=g(m.data,"health-port");v(d)&&(a=A(d,"utf-8").trim()||a)}catch{}const c=`http://127.0.0.1:${a}/healthz`,p=Date.now()+e;for(;Date.now()<p&&!this.stopped;){try{const d=await fetch(c,{signal:AbortSignal.timeout(2e3)});if(d.ok){if(!t)return!0;const u=await d.json();if(u.status==="ok"&&u.version===t&&typeof u.pid=="number"&&u.pid>0&&u.pid!==i)try{const o=JSON.parse(A(g(m.base,"daemon-status.json"),"utf-8")),y=Date.parse(r??"");return!!(o.state==="running"&&o.pid===u.pid&&typeof o.updated_at=="number"&&Number.isFinite(y)&&o.updated_at>=y)}catch{return!1}}}catch{}await new Promise(d=>setTimeout(d,we))}return!1}async runCheck(){if(!this.running){this.running=!0;try{await this.check()}catch(e){f.error("upgrade",`Check failed: ${e instanceof Error?e.message:e}`)}finally{this.running=!1}}}async check(){if($()){await this.handlePendingOnStartup();return}if(this.agentConfigs.length===0)return;const i=(await Promise.all(this.agentConfigs.map(l=>this.queryUpgrade(l)))).find(l=>l.available&&l.release)?.release;if(!i)return;const r=R();let a;try{a=re(i.version)}catch(l){const h=l;await this.reportUpgrade({from_version:r,to_version:String(i.version),status:"failed",error_code:h.code??"INVALID_VERSION",error_msg:h.message});return}const c=i.force,p=this.options.platform??process.platform,d=this.options.env??process.env;if(p==="win32"){const l=b(),h=d.GRIX_WRAPPER_SUPERVISED==="1";if(!h||!l||!this.options.requestGracefulShutdown){const _=`Windows automatic upgrade requires a refreshed service installation (${[...h?[]:["managed wrapper"],...l?[]:["external guardian"],...this.options.requestGracefulShutdown?[]:["graceful shutdown hook"]].join(", ")})`;n(_),await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:"WINDOWS_UPGRADE_UNSUPPORTED",error_msg:_});return}}const u=p==="darwin"&&!!b()&&!!this.options.requestGracefulShutdown;if(p==="darwin"&&!u&&n("macOS transactional upgrade prerequisites missing; falling back to the legacy guardian flow"),!c&&!this.checkRateLimit(a))return;const o=ae();if(!o.ok){await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:o.errorCode,error_msg:o.errorMsg});return}if(!await ee(G,a)){n(`target ${a} not resolvable on any registry yet; skipping this cycle (no failure recorded)`);return}n(`upgrade start: ${r} -> ${a}`);const y=Date.now();let w;try{if(w=ce(r,a,p==="win32"||u?"preparing":void 0).transaction_id,(await te(G,a,void 0,u?{activationMode:"staged"}:{}))?.activationRequired||oe(a),n("npm install verified, reporting installed"),await this.reportUpgrade({from_version:r,to_version:a,status:"installed",duration_ms:Date.now()-y}),n("shutting down for restart"),!await this.waitUntilIdle())throw n("upgrade aborted: checker stopped during wait"),this.options.reopenLifecycleAdmission?.(),new P("UPGRADE_ABORTED","Upgrade was aborted before lifecycle handoff");if(p==="win32"){if(!b())throw new P("WINDOWS_UPGRADE_UNSUPPORTED","Windows external guardian disappeared before lifecycle handoff");D(process.pid,w),n("Windows handoff armed; requesting graceful daemon shutdown"),await this.options.requestGracefulShutdown("upgrade")}else if(u){if(!b())throw new P("MACOS_UPGRADE_UNSUPPORTED","macOS guardian helper disappeared before lifecycle handoff");D(process.pid,w),n("macOS handoff armed; spawning guardian before graceful daemon shutdown"),await this.resumeWindowsGuardian(),await this.options.requestGracefulShutdown("upgrade")}else this.startGuardian(),process.kill(process.pid,"SIGTERM")}catch(l){const h=l instanceof P?l.code:"NPM_INSTALL_FAILED",S=l instanceof Error?l.message:String(l);n(`upgrade failed: ${h} ${S}`);const _=k();if(w&&_?.transaction_id===w&&(p==="win32"||u?(ne(),N(_)):se(_)&&n("upgrade failed before restart; previous package restored atomically"),T(_)||(n(`failed transaction ${w} is waiting for shared lock release`),this.schedulePendingReconcile()),this.options.reopenLifecycleAdmission?.()),h==="UPGRADE_IN_PROGRESS")return;de(S)||le(S)||h==="NPM_TIMEOUT"?n(`failure is retriable (${h}); skipping cooldown, will retry next cycle`):this.recordFailure(a),await this.reportUpgrade({from_version:r,to_version:a,status:"failed",error_code:h,error_msg:S,duration_ms:Date.now()-y,upgrade_log:Q()})}}async waitUntilIdle(){if(this.closeAdmission?.(),!this.isBusy?.())return!this.stopped;n("active tasks detected, waiting until idle before restart (no max wait)");const e=5e3,t=600*1e3;let i=Date.now();for(;this.isBusy()&&!this.stopped;)await new Promise(r=>setTimeout(r,e)),Date.now()-i>=t&&(i=Date.now(),n("still waiting for active tasks to finish before restart"));return this.stopped?!1:(n("all tasks completed, proceeding with restart"),!0)}checkRateLimit(e){const t=F();if(t.last_failure_at){const c=Date.now()-new Date(t.last_failure_at).getTime();if(c<O)return f.info("upgrade",`In cooldown, ${(O-c)/6e4}m remaining`),!1}const i=t.version_attempts[e]??0;if(i>=fe)return f.info("upgrade",`Version ${e} already tried ${i} times, skipping`),!1;const r=j(),a=t.daily_attempts[r]??0;return a>=he?(f.info("upgrade",`Already ${a} attempts today, skipping`),!1):!0}recordFailure(e){const t=F(),i=j();t.last_failure_at=new Date().toISOString(),t.last_failure_version=e,t.daily_attempts[i]=(t.daily_attempts[i]??0)+1,t.version_attempts[e]=(t.version_attempts[e]??0)+1;for(const a of Object.keys(t.daily_attempts))a<i&&delete t.daily_attempts[a];const r=Object.keys(t.version_attempts);for(const a of r.slice(0,Math.max(0,r.length-ge)))a!==e&&delete t.version_attempts[a];ke(t)}async queryUpgrade(e){const i=`${H(e.wsUrl)}/v1/agent-api/upgrade/check?`+new URLSearchParams({client_type:"grix-connector",client_version:R(),channel:e.channel??"stable",platform:process.platform,arch:process.arch}).toString();try{const r=await fetch(i,{headers:{Authorization:`Bearer ${e.apiKey}`},signal:AbortSignal.timeout(M)});if(!r.ok)return f.warn("upgrade",`Check API returned ${r.status}`),{available:!1};const a=await r.json();return a.code!==0?{available:!1}:a.data}catch(r){return f.warn("upgrade",`Check API error: ${r instanceof Error?r.message:r}`),{available:!1}}}async reportUpgrade(e){if(this.agentConfigs.length===0)return!1;const t={client_type:"grix-connector",...e.npm_version?e:{...e,...Z()}};return(await Promise.all(this.agentConfigs.map(async r=>{const c=`${H(r.wsUrl)}/v1/agent-api/upgrade/report`;try{return(await fetch(c,{method:"POST",headers:{Authorization:`Bearer ${r.apiKey}`,"Content-Type":"application/json"},body:JSON.stringify(t),signal:AbortSignal.timeout(M)})).ok}catch{return!1}}))).some(r=>r)}startGuardian(){const e=g(m.base,"bin","upgrade-guardian.sh");if(process.platform==="win32"||!v(e)){f.info("upgrade","Guardian not available on this platform, skipping");return}try{const t=I(e,[],{detached:!0,stdio:"ignore"});t.unref(),n(`guardian started (pid ${t.pid})`)}catch(t){f.warn("upgrade",`Failed to start guardian: ${t instanceof Error?t.message:t}`)}}}export{Ce as UpgradeChecker};
|
|
@@ -139,13 +139,15 @@ Do not omit any of the six.
|
|
|
139
139
|
### Implementation (format + send)
|
|
140
140
|
|
|
141
141
|
Build `content` as **only** the wire block below (field names Markdown-bold;
|
|
142
|
-
put
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
Markdown
|
|
147
|
-
|
|
148
|
-
|
|
142
|
+
put the `status` / `summary` / `session` field **value** in its own
|
|
143
|
+
` ```text ` fence — not the whole block, and not inline backticks — so
|
|
144
|
+
rendered bubbles expose a copy button). Write the `detail` value as **plain
|
|
145
|
+
Markdown directly under `**detail**:`, with no fence** — chat bubbles render
|
|
146
|
+
the block as Markdown, and fencing `detail` would show raw Markdown source
|
|
147
|
+
instead of parsed rich text. The `detail` value must be concise Markdown with
|
|
148
|
+
clear structure: bullets, short sections, paths in backticks, and command
|
|
149
|
+
results when relevant. Do not cram all detail into one sentence or one line.
|
|
150
|
+
**Do not** put `@…` in the content — wake/threading is done via
|
|
149
151
|
`quoted_message_id` on the tool call. No text outside the block. Then call
|
|
150
152
|
`grix_session_send` (see grix-owner-relay; or call the tool directly) with:
|
|
151
153
|
|
|
@@ -166,14 +168,12 @@ completed|failed|blocked
|
|
|
166
168
|
<一句话结论>
|
|
167
169
|
```
|
|
168
170
|
**detail**:
|
|
169
|
-
```markdown
|
|
170
171
|
- 变更:
|
|
171
172
|
- `<路径>`:<做了什么>
|
|
172
173
|
- 验证:
|
|
173
174
|
- `<命令>`:<结果>
|
|
174
175
|
- 备注:
|
|
175
176
|
- <阻塞/风险/无则写“无”>
|
|
176
|
-
```
|
|
177
177
|
**session**:
|
|
178
178
|
```text
|
|
179
179
|
<本工作会话 id(你被派来干活的这个会话)>
|
package/dist/grix.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import
|
|
3
|
-
Run \`grix-connector --help\` to see the supported commands and options.`),process.exit(1)),S.version&&(console.log(
|
|
2
|
+
import P from"node:path";import{writeFileSync as te}from"node:fs";import{Manager as xe}from"./manager.js";import{ensureGrixDirs as Ee,initLogger as De,log as s,installProcessLogRotation as be,setConsoleOutput as re}from"./core/log/index.js";import{HealthServer as ve,bindPortOrFail as ne}from"./core/runtime/index.js";import{writePidFile as Pe,removePidFile as O,readDaemonPid as Ie}from"./core/runtime/index.js";import{resolveRuntimePaths as j}from"./core/config/index.js";import{supportsNonMitmRelayConfig as ke}from"./core/config/provider-env.js";import{ServiceManager as Ce}from"./service/service-manager.js";import{migrateWindowsWrapper as Te}from"./service/windows-wrapper-migration.js";import{killProcessesByCommandLine as Ue,isWindowsElevated as $e,shouldSweepWindowsWrappers as _e}from"./service/process-control.js";import{buildServiceID as Fe}from"./service/service-paths.js";import{acquireDaemonLock as Le,isLockHolderSameProcess as Oe,readDaemonLock as K,releaseDaemonLock as H}from"./runtime/daemon-lock.js";import{writeDaemonStatus as N,removeDaemonStatus as He}from"./runtime/service-state.js";import{AdminServer as Me,generateToken as Be,writeTokenFile as Ne}from"./core/admin/index.js";import{initSentry as Ge,closeSentry as W,reportFatal as V}from"./core/observability/sentry.js";import{initProxyManager as je,getProxyManager as u,relayHostsForClientType as oe,RelayStateStore as Ke,SecretStore as We}from"./core/proxy/index.js";import{stopProxyIfNobodyNeedsIt as ae,switchAgentRelayMode as X,reconcileRelayStates as se}from"./core/proxy/relay-orchestration.js";import{setAgentRelayCredential as ie,RelayCredentialError as le}from"./core/proxy/relay-credential.js";import{RelayFetchError as ce,RelayToggleCoordinator as Ve}from"./core/proxy/relay-credential-fetch.js";import{applyHermesProfileRelay as Xe,clearHermesProfileRelay as qe,discoverHermesProfiles as Je}from"./core/proxy/hermes-profile-relay.js";import{disableRelayCredential as Ye,enableRelayCredential as ze,RelayRouteError as de}from"./core/proxy/relay-credential-router.js";import{upgradeStatusSnapshot as Qe}from"./core/upgrade/npm-upgrader.js";import{resolveClientVersion as Ze}from"./core/util/client-version.js";import{parseCliArgs as et}from"./core/util/cli-args.js";const{command:D,flags:S,unknownFlags:q}=et(process.argv.slice(2));if(q.length>0&&(console.error(`Unknown option${q.length>1?"s":""}: ${q.map(o=>`--${o}`).join(", ")}
|
|
3
|
+
Run \`grix-connector --help\` to see the supported commands and options.`),process.exit(1)),S.version&&(console.log(Ze()),process.exit(0)),S.help&&(console.log(`grix-connector \u2014 Unified AI Agent Bridge
|
|
4
4
|
|
|
5
5
|
Usage: grix-connector <command> [options]
|
|
6
6
|
|
|
@@ -34,9 +34,9 @@ Examples:
|
|
|
34
34
|
grix-connector start # Start as system service
|
|
35
35
|
grix-connector status # Check service status
|
|
36
36
|
grix-connector restart # Restart the service
|
|
37
|
-
`),process.exit(0)),
|
|
37
|
+
`),process.exit(0)),D==="reload"){const o=Ie();o||(console.error("reload failed: daemon is not running (no pid file)"),process.exit(1));try{process.kill(o,0)}catch{console.error(`reload failed: daemon process ${o} is not running (stale pid file)`),process.exit(1)}{const p=K(j().daemonLockFile);p&&p.pid===o&&!Oe(p)&&(console.error(`reload failed: pid ${o} has been reused by another process (stale pid file)`),process.exit(1))}try{process.kill(o,"SIGHUP"),console.log(JSON.stringify({ok:!0,signaled:o},null,2)),process.exit(0)}catch(p){console.error(`reload failed: ${p instanceof Error?p.message:p}`),process.exit(1)}}const pe=["start","stop","restart","status"];if(D&&pe.includes(D)){process.platform==="win32"&&["start","stop","restart"].includes(D)&&!$e()&&console.warn(`Warning: Not running as administrator. Task Scheduler registration is skipped;
|
|
38
38
|
using Startup folder auto-start instead. For full Task Scheduler integration,
|
|
39
|
-
right-click the terminal and select "Run as administrator".`);const o=
|
|
40
|
-
Valid commands: ${
|
|
41
|
-
`),s.error("main",o.message.replace(/\n/g," \u2014 "));const d=j(l.daemonLockFile);d?.pid===process.pid&&d.instance_id===C&&await H(l.daemonStatusFile,{state:"failed",pid:process.pid,instance_id:C,updated_at:Date.now(),reason:`port_bind_${o.kind}:${o.label}:${o.port}`}).catch(()=>{}),await K(),L(l.daemonLockFile).catch(()=>{}),F(),process.exit(1)}async function M(o){if(J)return;J=!0,s.info("main",`Received ${o}, shutting down...`),B.markShuttingDown();const d=setTimeout(()=>{s.error("main","Shutdown timed out, forcing exit"),L(l.daemonLockFile).catch(()=>{}),F(),process.exit(2)},1e4);try{await n.stop(),await f()?.stop().catch(()=>{}),await D.stop(),await B.stop(),await K(),await L(l.daemonLockFile),await Fe(l.daemonStatusFile).catch(()=>{}),clearTimeout(d),F(),s.info("main","Shutdown complete"),process.exit(0)}catch(h){s.error("main",`Shutdown error: ${h}`),L(l.daemonLockFile).catch(()=>{}),F(),process.exit(2)}}async function Qe(){if(xe(),Ee(),be(l.stdoutLogFile,l.stderrLogFile),te(!1),process.platform==="win32"){const e=Ue(l.rootDir,"win32");await Ce(e,{platform:"win32"})}try{C=(await _e(l.daemonLockFile,l.rootDir)).instance_id}catch(e){console.error(e instanceof Error?e.message:e),process.exit(1)}await Be(),ve(),s.info("main",`grix-connector starting (PID ${process.pid})`),await H(l.daemonStatusFile,{state:"starting",pid:process.pid,instance_id:C,updated_at:Date.now()});const o=parseInt(S["health-port"]??process.env.GRIX_HEALTH_PORT??"19579",10);{const e=await re({label:"health",port:o,envVar:"GRIX_HEALTH_PORT",cliFlag:"health-port",start:a=>B.start(a)});e&&await ge(e)}const d=I.join(l.dataDir,"health-port");ee(d,String(o),"utf-8"),process.on("SIGINT",()=>M("SIGINT")),process.on("SIGTERM",()=>M("SIGTERM")),process.on("SIGHUP",()=>{J||(s.info("main","Received SIGHUP, reloading config..."),n.reload().then(e=>s.info("main",`reload done: ${JSON.stringify(e)}`)).catch(e=>s.error("main",`reload failed: ${e instanceof Error?e.message:e}`)))});let h="",g=0,u;process.on("uncaughtException",e=>{const a=e instanceof Error?e.stack??e.message:String(e);a===h?(g++,(g<=3||g%100===0)&&s.error("main",`Uncaught exception (x${g}): ${a}`)):(g>3&&s.error("main",`Previous exception repeated ${g} times total`),h=a,g=1,s.error("main",`Uncaught exception: ${e instanceof Error?e.stack:e}`),u||(u=setTimeout(()=>{g>3&&s.error("main",`Previous exception repeated ${g} times total`),h="",g=0,u=void 0},1e4).unref())),!ue(e)&&(V(e,"uncaughtException"),M("uncaughtException"))}),process.on("unhandledRejection",e=>{s.error("main",`Unhandled rejection: ${e}`),!ue(e)&&(V(e,"unhandledRejection"),M("unhandledRejection"))});const v=Me(l.dataDir);await v.clearRuntimeState();const P=new Ne(I.join(l.dataDir,"proxy","relay-state.json"),{warn:e=>s.warn("main",e)}),O=new Ge(I.join(l.dataDir,"secrets"));n.setRelaySecretResolver(e=>O.get(e));const T={hasDirectConfig:e=>n.hasDirectRelayConfig(e),clearDirectConfig:(e,a)=>n.setAgentProvider(e,void 0,{deferRestart:a?.deferRestart===!0})},N=()=>({pm:f(),agents:n,direct:T,store:P,secrets:O}),U=v.getRelayAgents();if(U.length>0)try{await v.startIfAnyRelayAgent(),s.info("main",`mitm proxy started for relay agents: ${U.join(", ")} (per-agent; others stay direct)`)}catch(e){s.error("main",`mitm proxy FAILED to start (relay agents: ${U.join(", ")}): ${e}. These agents will REFUSE to start (they must not silently fall back to your own account). Fix the proxy or turn relay off for them. Other agents are unaffected.`)}else s.info("main",'mitm proxy idle (no agent has Grix relay enabled; enable: PUT /api/proxy/agents/<name>/enabled {"enabled":true})');let _=null;if(f()){const e=async()=>{const t=f();t&&await oe(t,n)&&s.info("main","no agent uses Grix relay anymore; mitm proxy stopped")};n.setRelayEnvSettledHandler(()=>{const t=f();t&&ae(t,T,P),e().catch(r=>{s.warn("main",`failed to stop idle mitm proxy: ${r}`)})});const a=()=>{const t=f(),r=t.getRelayAgents(),i=t.getDegradedRelayAgents();return{enabled:r.length>0,relayAgents:r,staleRelayAgents:n.getAgentsWithStaleRelayEnv(),degradedRelayAgents:i,relayState:P.list(),runtime:t.getRuntimeInfo(),config:t.getConfigSnapshot()}},c=new je,A={status:()=>a(),setAgentRelay:async(t,r,i)=>{const p=f(),R={info:y=>s.info("main",y),warn:y=>s.warn("main",y)},w=y=>n.getAgentsStatus().find(x=>x.name===y),m=w(t);if(!r){c.cancel(t);const y=await c.runExclusive(t,async()=>{const x=await W(N(),R,{agentName:t,target:"off"});return{...a(),restarted:x.restarted,busy:x.busy,...x.pending?{pending:x.pending}:{}}});return n.reportRelayStateLocalChange(t),y}if(!m)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});if(!Ie(m.clientType)&&ne(m.clientType).length===0)throw Object.assign(new Error(`client type "${m.clientType??""}" does not support Grix relay`),{code:"UNSUPPORTED_CLIENT_TYPE"});const $=await c.runExclusive(t,async()=>{const y=c.epoch(t),x=w(t);if(!x)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});const z=String(x.agentId??"").trim();if(!z)throw new ie(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const Q=c.waitCancelled(t,y);let k;try{k=await Promise.race([n.fetchRelayCredential(t,{model:i}),Q.promise.then(()=>{throw new le("relay enable cancelled by a later disable","CANCELLED")})])}finally{Q.dispose()}c.assertCurrent(t,y);const{restarted:ye,busy:he,pending:Z}=await se(p,n,w,R,{localName:t,agentId:z,virtualKey:k.apiKey,anthropicBaseUrl:k.anthropicBaseUrl,openaiBaseUrl:k.openaiBaseUrl,model:i,...k.directRelay!==void 0?{directRelay:k.directRelay}:{}},(we,Re,Se)=>n.setAgentProvider(we,Re,{deferRestart:Se?.deferRestart===!0}),{store:P,secrets:O,direct:T});if(c.epoch(t)!==y)throw await W(N(),R,{agentName:t,target:"off"}),new le("relay enable cancelled by a later disable","CANCELLED");return{...a(),restarted:ye,busy:he,...Z?{pending:Z}:{}}});return n.reportRelayStateLocalChange(t),$},setAgentRelayCredential:async(t,r)=>{const i=f(),p=n.getAgentsStatus(),{restarted:R,busy:w,pending:m}=await se(i,n,E=>p.find($=>$.name===E),{info:E=>s.info("main",E),warn:E=>s.warn("main",E)},{localName:t,agentId:r.agentId,virtualKey:r.virtualKey,anthropicBaseUrl:r.anthropicBaseUrl,openaiBaseUrl:r.openaiBaseUrl,model:r.model,...r.directRelay!==void 0?{directRelay:r.directRelay}:{}},(E,$,y)=>n.setAgentProvider(E,$,{deferRestart:y?.deferRestart===!0}),{store:P,secrets:O,direct:T});return n.reportRelayStateLocalChange(t),{...a(),restarted:R,busy:w,...m?{pending:m}:{}}},disableAll:async()=>{const t=f(),r={info:p=>s.info("main",p),warn:p=>s.warn("main",p)},i=new Set([...t.getRelayAgents(),...n.getDirectRelayConfigAgentNames(),...Object.keys(P.list())]);for(const p of i)c.cancel(p);for(const p of i)await c.runExclusive(p,()=>W(N(),r,{agentName:p,target:"off"})),n.reportRelayStateLocalChange(p);return await oe(t,n),a()},setRoute:async(t,r)=>{const i=r,p=f();return p.setRoute({routeKey:t,targetBaseUrl:i.targetBaseUrl,...i.headers?{headers:i.headers}:{},...i.model?{model:i.model}:{},...i.modelMap?{modelMap:i.modelMap}:{},...i.passthrough?{passthrough:!0}:{},...i.relayOnly?{relayOnly:!0}:{},...i.codexResponsesToChat?{codexResponsesToChat:!0}:{}}),await p.persistConfig(),a()},deleteRoute:async t=>{const r=f();r.deleteRoute(t),await r.persistConfig()},setDefaultRoute:async t=>{const r=f();return r.setDefaultRouteKey(t),await r.persistConfig(),a()},setInterceptHosts:async t=>{const r=f();return r.setInterceptHosts(t),await r.persistConfig(),a()}};_=A,D.setProxyHandler(A),n.setRelayStateApplier({getLocalState:t=>{const r=f();if(r.getRelayAgents().includes(t)){const p=n.getAgentsStatus().find(m=>m.name===t),R=`grix-gateway-${String(p?.clientType??"").trim().toLowerCase()}`;return{enabled:!0,model:r.getConfigSnapshot().routes?.find(m=>m.routeKey===R)?.model?.trim()||void 0}}const i=n.getAgentProvider(t);return i?.api_key?.trim()?{enabled:!0,model:i.model?.trim()||void 0}:{enabled:!1}},applyEnable:async(t,r,i)=>{const p=n.getAgentsStatus().find(m=>m.name===t),R=String(p?.agentId??"").trim();if(!R)throw new ie(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const w=await A.setAgentRelayCredential(t,{agentId:R,virtualKey:r.apiKey,anthropicBaseUrl:r.anthropicBaseUrl,openaiBaseUrl:r.openaiBaseUrl,model:i??r.model,...r.directRelay!==void 0?{directRelay:r.directRelay}:{}});return{restarted:w.restarted===!0,busy:w.busy===!0,...w.pending?{pending:w.pending}:{}}},applyDisable:async t=>{const r=await A.setAgentRelay(t,!1);return{restarted:r.restarted===!0,busy:r.busy===!0,...r.pending?{pending:r.pending}:{}}}})}if(B.setStatusProvider(()=>n.getAgentsStatus()),await n.start(ze),U.length>0){const e=n.getAgentsStatus();for(const a of U){const c=e.find(t=>t.name===a);if(!c)continue;const A=ne(c.clientType);A.length!==0&&await v.setAgentRelayEnabled(a,!0,{relayHosts:A}).catch(t=>{s.warn("main",`failed to reconcile relay hosts for "${a}": ${t}`)})}}ae(v,T,P);const Y=parseInt(S["admin-port"]??process.env.GRIX_ADMIN_PORT??"19580",10);D.setAgentHandler({list:()=>n.getAgentsStatus(),add:e=>n.addAgent(e),remove:e=>n.removeAgent(e),restart:e=>n.restartAgent(e),reload:()=>n.reload()}),D.setUpgradeHandler({check:()=>n.checkUpgrade(),trigger:()=>n.triggerUpgrade()}),D.setProbeHandler({probeAll:e=>n.probeAll(e),probeOne:(e,a)=>n.probeOne(e,a)}),D.setInstallHandler({listInstallable:()=>n.listInstallable(),installAgent:e=>n.installAgent(e),getInstallProgress:e=>n.getInstallProgress(e)});const q={listAgents:()=>n.getAgentsStatus(),enableManaged:(e,a,c)=>{if(!_)throw new ce(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return _.setAgentRelayCredential(e,{agentId:a,virtualKey:c.virtualKey,anthropicBaseUrl:c.anthropicBaseUrl,openaiBaseUrl:c.openaiBaseUrl,model:c.model,...c.directRelay!==void 0?{directRelay:c.directRelay}:{}})},disableManaged:e=>{if(!_)throw new ce(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return _.setAgentRelay(e,!1)},enableHermesProfile:(e,a)=>Ke({agentId:e,baseUrl:a.openaiBaseUrl??"",virtualKey:a.virtualKey,model:a.model??""}),disableHermesProfile:e=>Ve(e)};D.setRelayCredentialHandler({listHermesProfiles:()=>We(),enable:async(e,a)=>{const{target:c,result:A}=await Je(q,e,a);return{target:c,...A}},disable:async e=>{const{target:a,result:c}=await Xe(q,e);return{target:a,...c}}});{const e=await re({label:"admin",port:Y,envVar:"GRIX_ADMIN_PORT",cliFlag:"admin-port",start:a=>D.start(a)});e&&await ge(e)}const fe=I.join(l.dataDir,"admin-token"),me=I.join(l.dataDir,"admin-port");He(fe,pe),ee(me,String(Y),"utf-8"),await H(l.daemonStatusFile,{state:"running",pid:process.pid,instance_id:C,updated_at:Date.now()}),process.send&&process.send("ready"),s.info("main","grix-connector ready")}Qe().catch(async o=>{const d=`Fatal: ${o instanceof Error?o.stack??o.message:String(o)}`;try{process.stderr.write(`${d}
|
|
42
|
-
`)}catch{}
|
|
39
|
+
right-click the terminal and select "Run as administrator".`);const o=j(),p=S["config-dir"]??(S.profile?P.join(o.configDir,S.profile):void 0),R=P.resolve(process.argv[1]||`${o.rootDir}/dist/grix.js`),y=new Ce({cliPath:R,nodePath:process.execPath});try{let d;switch(D){case"start":(await y.status({rootDir:o.rootDir})).installed?d=await y.start({rootDir:o.rootDir}):d=await y.install({rootDir:o.rootDir,configDir:p});break;case"stop":d=await y.stop({rootDir:o.rootDir});break;case"restart":(await y.status({rootDir:o.rootDir})).installed?d=await y.restart({rootDir:o.rootDir}):d=await y.install({rootDir:o.rootDir,configDir:p});break;case"status":d=await y.status({rootDir:o.rootDir});break}console.log(JSON.stringify(d,null,2)),process.exit(0)}catch(d){console.error(`${D} failed: ${d instanceof Error?d.message:d}`),process.exit(1)}}else D&&(console.error(`Unknown command: ${D}
|
|
40
|
+
Valid commands: ${pe.join(", ")}`),process.exit(1));const l=j(),tt=S["config-dir"]??(S.profile?`${l.configDir}/${S.profile}`:void 0),r=new xe({requestGracefulShutdown:()=>{C("upgrade")}}),M=new ve,ge=Be(),b=new Me(ge);let J=!1,k;async function ue(o){process.stderr.write(o.message+`
|
|
41
|
+
`),s.error("main",o.message.replace(/\n/g," \u2014 "));const p=K(l.daemonLockFile);p?.pid===process.pid&&p.instance_id===k&&await N(l.daemonStatusFile,{state:"failed",pid:process.pid,instance_id:k,updated_at:Date.now(),reason:`port_bind_${o.kind}:${o.label}:${o.port}`}).catch(()=>{}),await W(),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(1)}async function C(o){if(J)return;J=!0,s.info("main",`Received ${o}, shutting down...`),M.markShuttingDown();const p=setTimeout(()=>{s.error("main","Shutdown timed out, forcing exit"),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(2)},1e4);try{await r.stop(),await u()?.stop().catch(()=>{}),await b.stop(),await M.stop(),await W(),await H(l.daemonLockFile),await He(l.daemonStatusFile).catch(()=>{}),clearTimeout(p),O(),s.info("main","Shutdown complete"),process.exit(0)}catch(R){s.error("main",`Shutdown error: ${R}`),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(2)}}async function rt(){if(Ee(),De(),be(l.stdoutLogFile,l.stderrLogFile),re(!1),_e()){const e=Fe(l.rootDir,"win32");await Ue(e,{platform:"win32"})}try{k=(await Le(l.daemonLockFile,l.rootDir)).instance_id}catch(e){console.error(e instanceof Error?e.message:e),process.exit(1)}if(await Ge(),Pe(),s.info("main",`grix-connector starting (PID ${process.pid})`),await N(l.daemonStatusFile,{state:"starting",pid:process.pid,instance_id:k,updated_at:Date.now()}),(await Te({rootDir:l.rootDir,requestGracefulShutdown:()=>{C("wrapper-migration")}}).catch(e=>(s.warn("main",`Windows wrapper migration failed: ${e instanceof Error?e.message:e}`),null)))?.handoffStarted)return;const p=parseInt(S["health-port"]??process.env.GRIX_HEALTH_PORT??"19579",10);{const e=await ne({label:"health",port:p,envVar:"GRIX_HEALTH_PORT",cliFlag:"health-port",start:a=>M.start(a)});e&&await ue(e)}const R=P.join(l.dataDir,"health-port");te(R,String(p),"utf-8"),process.on("SIGINT",()=>C("SIGINT")),process.on("SIGTERM",()=>C("SIGTERM")),process.on("SIGHUP",()=>{J||(s.info("main","Received SIGHUP, reloading config..."),r.reload().then(e=>s.info("main",`reload done: ${JSON.stringify(e)}`)).catch(e=>s.error("main",`reload failed: ${e instanceof Error?e.message:e}`)))});let y="",d=0,T;process.on("uncaughtException",e=>{const a=e instanceof Error?e.stack??e.message:String(e);a===y?(d++,(d<=3||d%100===0)&&s.error("main",`Uncaught exception (x${d}): ${a}`)):(d>3&&s.error("main",`Previous exception repeated ${d} times total`),y=a,d=1,s.error("main",`Uncaught exception: ${e instanceof Error?e.stack:e}`),T||(T=setTimeout(()=>{d>3&&s.error("main",`Previous exception repeated ${d} times total`),y="",d=0,T=void 0},1e4).unref())),!fe(e)&&(V(e,"uncaughtException"),C("uncaughtException"))}),process.on("unhandledRejection",e=>{s.error("main",`Unhandled rejection: ${e}`),!fe(e)&&(V(e,"unhandledRejection"),C("unhandledRejection"))});const U=je(l.dataDir);await U.clearRuntimeState();const v=new Ke(P.join(l.dataDir,"proxy","relay-state.json"),{warn:e=>s.warn("main",e)}),B=new We(P.join(l.dataDir,"secrets"));r.setRelaySecretResolver(e=>B.get(e));const $={hasDirectConfig:e=>r.hasDirectRelayConfig(e),clearDirectConfig:(e,a)=>r.setAgentProvider(e,void 0,{deferRestart:a?.deferRestart===!0})},G=()=>({pm:u(),agents:r,direct:$,store:v,secrets:B}),_=U.getRelayAgents();if(_.length>0)try{await U.startIfAnyRelayAgent(),s.info("main",`mitm proxy started for relay agents: ${_.join(", ")} (per-agent; others stay direct)`)}catch(e){s.error("main",`mitm proxy FAILED to start (relay agents: ${_.join(", ")}): ${e}. These agents will REFUSE to start (they must not silently fall back to your own account). Fix the proxy or turn relay off for them. Other agents are unaffected.`)}else s.info("main",'mitm proxy idle (no agent has Grix relay enabled; enable: PUT /api/proxy/agents/<name>/enabled {"enabled":true})');let F=null;if(u()){const e=async()=>{const t=u();t&&await ae(t,r)&&s.info("main","no agent uses Grix relay anymore; mitm proxy stopped")};r.setRelayEnvSettledHandler(()=>{const t=u();t&&se(t,$,v),e().catch(n=>{s.warn("main",`failed to stop idle mitm proxy: ${n}`)})});const a=()=>{const t=u(),n=t.getRelayAgents(),i=t.getDegradedRelayAgents();return{enabled:n.length>0,relayAgents:n,staleRelayAgents:r.getAgentsWithStaleRelayEnv(),degradedRelayAgents:i,relayState:v.list(),runtime:t.getRuntimeInfo(),config:t.getConfigSnapshot()}},c=new Ve,A={status:()=>a(),setAgentRelay:async(t,n,i)=>{const g=u(),w={info:m=>s.info("main",m),warn:m=>s.warn("main",m)},h=m=>r.getAgentsStatus().find(x=>x.name===m),f=h(t);if(!n){c.cancel(t);const m=await c.runExclusive(t,async()=>{const x=await X(G(),w,{agentName:t,target:"off"});return{...a(),restarted:x.restarted,busy:x.busy,...x.pending?{pending:x.pending}:{}}});return r.reportRelayStateLocalChange(t),m}if(!f)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});if(!ke(f.clientType)&&oe(f.clientType).length===0)throw Object.assign(new Error(`client type "${f.clientType??""}" does not support Grix relay`),{code:"UNSUPPORTED_CLIENT_TYPE"});const L=await c.runExclusive(t,async()=>{const m=c.epoch(t),x=h(t);if(!x)throw Object.assign(new Error(`Agent "${t}" not found`),{code:"NOT_FOUND"});const Q=String(x.agentId??"").trim();if(!Q)throw new le(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const Z=c.waitCancelled(t,m);let I;try{I=await Promise.race([r.fetchRelayCredential(t,{model:i}),Z.promise.then(()=>{throw new ce("relay enable cancelled by a later disable","CANCELLED")})])}finally{Z.dispose()}c.assertCurrent(t,m);const{restarted:he,busy:we,pending:ee}=await ie(g,r,h,w,{localName:t,agentId:Q,virtualKey:I.apiKey,anthropicBaseUrl:I.anthropicBaseUrl,openaiBaseUrl:I.openaiBaseUrl,model:i,...I.directRelay!==void 0?{directRelay:I.directRelay}:{}},(Se,Re,Ae)=>r.setAgentProvider(Se,Re,{deferRestart:Ae?.deferRestart===!0}),{store:v,secrets:B,direct:$});if(c.epoch(t)!==m)throw await X(G(),w,{agentName:t,target:"off"}),new ce("relay enable cancelled by a later disable","CANCELLED");return{...a(),restarted:he,busy:we,...ee?{pending:ee}:{}}});return r.reportRelayStateLocalChange(t),L},setAgentRelayCredential:async(t,n)=>{const i=u(),g=r.getAgentsStatus(),{restarted:w,busy:h,pending:f}=await ie(i,r,E=>g.find(L=>L.name===E),{info:E=>s.info("main",E),warn:E=>s.warn("main",E)},{localName:t,agentId:n.agentId,virtualKey:n.virtualKey,anthropicBaseUrl:n.anthropicBaseUrl,openaiBaseUrl:n.openaiBaseUrl,model:n.model,...n.directRelay!==void 0?{directRelay:n.directRelay}:{}},(E,L,m)=>r.setAgentProvider(E,L,{deferRestart:m?.deferRestart===!0}),{store:v,secrets:B,direct:$});return r.reportRelayStateLocalChange(t),{...a(),restarted:w,busy:h,...f?{pending:f}:{}}},disableAll:async()=>{const t=u(),n={info:g=>s.info("main",g),warn:g=>s.warn("main",g)},i=new Set([...t.getRelayAgents(),...r.getDirectRelayConfigAgentNames(),...Object.keys(v.list())]);for(const g of i)c.cancel(g);for(const g of i)await c.runExclusive(g,()=>X(G(),n,{agentName:g,target:"off"})),r.reportRelayStateLocalChange(g);return await ae(t,r),a()},setRoute:async(t,n)=>{const i=n,g=u();return g.setRoute({routeKey:t,targetBaseUrl:i.targetBaseUrl,...i.headers?{headers:i.headers}:{},...i.model?{model:i.model}:{},...i.modelMap?{modelMap:i.modelMap}:{},...i.passthrough?{passthrough:!0}:{},...i.relayOnly?{relayOnly:!0}:{},...i.codexResponsesToChat?{codexResponsesToChat:!0}:{}}),await g.persistConfig(),a()},deleteRoute:async t=>{const n=u();n.deleteRoute(t),await n.persistConfig()},setDefaultRoute:async t=>{const n=u();return n.setDefaultRouteKey(t),await n.persistConfig(),a()},setInterceptHosts:async t=>{const n=u();return n.setInterceptHosts(t),await n.persistConfig(),a()}};F=A,b.setProxyHandler(A),r.setRelayStateApplier({getLocalState:t=>{const n=u();if(n.getRelayAgents().includes(t)){const g=r.getAgentsStatus().find(f=>f.name===t),w=`grix-gateway-${String(g?.clientType??"").trim().toLowerCase()}`;return{enabled:!0,model:n.getConfigSnapshot().routes?.find(f=>f.routeKey===w)?.model?.trim()||void 0}}const i=r.getAgentProvider(t);return i?.api_key?.trim()?{enabled:!0,model:i.model?.trim()||void 0}:{enabled:!1}},applyEnable:async(t,n,i)=>{const g=r.getAgentsStatus().find(f=>f.name===t),w=String(g?.agentId??"").trim();if(!w)throw new le(`local agent "${t}" has no agent_id registered`,"MISSING_AGENT_ID");const h=await A.setAgentRelayCredential(t,{agentId:w,virtualKey:n.apiKey,anthropicBaseUrl:n.anthropicBaseUrl,openaiBaseUrl:n.openaiBaseUrl,model:i??n.model,...n.directRelay!==void 0?{directRelay:n.directRelay}:{}});return{restarted:h.restarted===!0,busy:h.busy===!0,...h.pending?{pending:h.pending}:{}}},applyDisable:async t=>{const n=await A.setAgentRelay(t,!1);return{restarted:n.restarted===!0,busy:n.busy===!0,...n.pending?{pending:n.pending}:{}}}})}if(M.setStatusProvider(()=>r.getAgentsStatus()),M.setMetaProvider(()=>{const e=r.getAgentsStatus();return{ws:{connected:e.filter(a=>a.wsConnected===!0).length,total:e.length},upgrade:Qe()}}),await r.start(tt),_.length>0){const e=r.getAgentsStatus();for(const a of _){const c=e.find(t=>t.name===a);if(!c)continue;const A=oe(c.clientType);A.length!==0&&await U.setAgentRelayEnabled(a,!0,{relayHosts:A}).catch(t=>{s.warn("main",`failed to reconcile relay hosts for "${a}": ${t}`)})}}se(U,$,v);const Y=parseInt(S["admin-port"]??process.env.GRIX_ADMIN_PORT??"19580",10);b.setAgentHandler({list:()=>r.getAgentsStatus(),add:e=>r.addAgent(e),remove:e=>r.removeAgent(e),restart:e=>r.restartAgent(e),reload:()=>r.reload()}),b.setUpgradeHandler({check:()=>r.checkUpgrade(),trigger:()=>r.triggerUpgrade()}),b.setProbeHandler({probeAll:e=>r.probeAll(e),probeOne:(e,a)=>r.probeOne(e,a)}),b.setInstallHandler({listInstallable:()=>r.listInstallable(),installAgent:e=>r.installAgent(e),getInstallProgress:e=>r.getInstallProgress(e)});const z={listAgents:()=>r.getAgentsStatus(),enableManaged:(e,a,c)=>{if(!F)throw new de(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return F.setAgentRelayCredential(e,{agentId:a,virtualKey:c.virtualKey,anthropicBaseUrl:c.anthropicBaseUrl,openaiBaseUrl:c.openaiBaseUrl,model:c.model,...c.directRelay!==void 0?{directRelay:c.directRelay}:{}})},disableManaged:e=>{if(!F)throw new de(`agent "${e}" needs the MITM proxy for relay, but it is not running`,"PROXY_UNAVAILABLE");return F.setAgentRelay(e,!1)},enableHermesProfile:(e,a)=>Xe({agentId:e,baseUrl:a.openaiBaseUrl??"",virtualKey:a.virtualKey,model:a.model??""}),disableHermesProfile:e=>qe(e)};b.setRelayCredentialHandler({listHermesProfiles:()=>Je(),enable:async(e,a)=>{const{target:c,result:A}=await ze(z,e,a);return{target:c,...A}},disable:async e=>{const{target:a,result:c}=await Ye(z,e);return{target:a,...c}}});{const e=await ne({label:"admin",port:Y,envVar:"GRIX_ADMIN_PORT",cliFlag:"admin-port",start:a=>b.start(a)});e&&await ue(e)}const me=P.join(l.dataDir,"admin-token"),ye=P.join(l.dataDir,"admin-port");Ne(me,ge),te(ye,String(Y),"utf-8"),await N(l.daemonStatusFile,{state:"running",pid:process.pid,instance_id:k,updated_at:Date.now()}),process.send&&process.send("ready"),s.info("main","grix-connector ready")}rt().catch(async o=>{const p=`Fatal: ${o instanceof Error?o.stack??o.message:String(o)}`;try{process.stderr.write(`${p}
|
|
42
|
+
`)}catch{}re(!1),s.error("main",p),V(o,"startup");const R=K(l.daemonLockFile);R?.pid===process.pid&&R.instance_id===k&&await N(l.daemonStatusFile,{state:"failed",pid:process.pid,instance_id:R.instance_id,updated_at:Date.now(),reason:"startup_error"}).catch(()=>{}),await W(),H(l.daemonLockFile).catch(()=>{}),O(),process.exit(1)});const nt=new Set(["ECONNRESET","ECONNREFUSED","ETIMEDOUT","EPIPE","EAI_AGAIN","ENOTFOUND","EHOSTUNREACH","ENETUNREACH","EIO"]);function fe(o){return o instanceof Error&&"code"in o?nt.has(o.code):!1}
|
package/dist/log.js
ADDED
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import{createWriteStream as g,mkdirSync as l,existsSync as f}from"node:fs";import{join as i}from"node:path";import{homedir as m}from"node:os";const n=i(m(),".grix"),s={base:n,config:i(n,"config"),log:i(n,"log"),data:i(n,"data")};function S(){for(const o of Object.values(s))f(o)||l(o,{recursive:!0})}let a=null;function $(){const o=new Date().toISOString().slice(0,10),r=i(s.log,`grix-acp-${o}.log`);a=g(r,{flags:"a"})}function c(){return new Date().toISOString().slice(11,19)}const u={info(o,r,...t){const e=`${c()} [${o}] ${r}${t.length?" "+t.map(String).join(" "):""}`;console.log(e),a?.write(e+`
|
|
2
|
+
`)},error(o,r,...t){const e=`${c()} [${o}] ERROR ${r}${t.length?" "+t.map(String).join(" "):""}`;console.error(e),a?.write(e+`
|
|
3
|
+
`)}};export{s as GRIX_PATHS,S as ensureGrixDirs,$ as initLogger,u as log};
|
package/dist/main.js
ADDED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import x from"node:path";import{Manager as E}from"./manager.js";import{ensureGrixDirs as k,initLogger as O,log as a}from"./core/log/index.js";import{HealthServer as I}from"./core/runtime/index.js";import{writePidFile as R,removePidFile as l}from"./core/runtime/index.js";import{resolveRuntimePaths as g}from"./core/config/index.js";import{ServiceManager as T}from"./service/service-manager.js";import{acquireDaemonLock as $,releaseDaemonLock as p}from"./runtime/daemon-lock.js";import{writeDaemonStatus as f,removeDaemonStatus as F}from"./runtime/service-state.js";const n=process.argv.slice(2),m=[],s={};for(let e=0;e<n.length;e++)n[e].startsWith("--")&&n[e+1]&&!n[e+1].startsWith("--")?(s[n[e].slice(2)]=n[e+1],e++):n[e].startsWith("--")?s[n[e].slice(2)]="true":m.push(n[e]);if(s.help&&(console.log(`grix-connector \u2014 Unified AI Agent Bridge
|
|
3
|
+
|
|
4
|
+
Usage: grix-connector [options]
|
|
5
|
+
grix-connector service <action> [options]
|
|
6
|
+
|
|
7
|
+
Actions (service):
|
|
8
|
+
install Install and start as OS service
|
|
9
|
+
start Start the OS service
|
|
10
|
+
stop Stop the OS service
|
|
11
|
+
restart Restart the OS service
|
|
12
|
+
uninstall Uninstall the OS service
|
|
13
|
+
status Show service and daemon status
|
|
14
|
+
|
|
15
|
+
Options:
|
|
16
|
+
--config-dir <path> Config directory (default: ~/.grix/config)
|
|
17
|
+
--profile <name> Profile name for config subdirectory
|
|
18
|
+
--health-port <port> Health check port (default: 19579)
|
|
19
|
+
--help Show this help message
|
|
20
|
+
|
|
21
|
+
Platform services:
|
|
22
|
+
macOS: launchd (LaunchAgent)
|
|
23
|
+
Linux: systemd --user
|
|
24
|
+
Windows: Task Scheduler
|
|
25
|
+
|
|
26
|
+
Examples:
|
|
27
|
+
grix-connector # Run in foreground
|
|
28
|
+
grix-connector service install # Install as OS service
|
|
29
|
+
grix-connector service status # Check service status
|
|
30
|
+
grix-connector service uninstall # Remove OS service
|
|
31
|
+
`),process.exit(0)),m[0]==="service"){const e=m[1],t=["install","start","stop","restart","uninstall","status"];(!e||!t.includes(e))&&(console.error(`Usage: grix-connector service <${t.join("|")}>`),process.exit(1));const o=g(),w=s["config-dir"]??(s.profile?`${o.configDir}/${s.profile}`:void 0),D=x.resolve(process.argv[1]||`${o.rootDir}/dist/main.js`),c=new T({cliPath:D,nodePath:process.execPath});try{let r;switch(e){case"install":r=await c.install({rootDir:o.rootDir,configDir:w});break;case"start":r=await c.start({rootDir:o.rootDir});break;case"stop":r=await c.stop({rootDir:o.rootDir});break;case"restart":r=await c.restart({rootDir:o.rootDir});break;case"uninstall":r=await c.uninstall({rootDir:o.rootDir});break;case"status":r=await c.status({rootDir:o.rootDir});break}console.log(JSON.stringify(r,null,2)),process.exit(0)}catch(r){console.error(`service ${e} failed: ${r instanceof Error?r.message:r}`),process.exit(1)}}const i=g(),N=s["config-dir"]??(s.profile?`${i.configDir}/${s.profile}`:void 0),h=new E,d=new I;let S=!1;async function u(e){if(S)return;S=!0,a.info("main",`Received ${e}, shutting down...`),d.markShuttingDown();const t=setTimeout(()=>{a.error("main","Shutdown timed out, forcing exit"),p(i.daemonLockFile).catch(()=>{}),l(),process.exit(2)},1e4);try{await h.stop(),await d.stop(),await p(i.daemonLockFile),await F(i.daemonStatusFile).catch(()=>{}),clearTimeout(t),l(),a.info("main","Shutdown complete"),process.exit(0)}catch(o){a.error("main",`Shutdown error: ${o}`),p(i.daemonLockFile).catch(()=>{}),l(),process.exit(2)}}async function P(){k(),O();try{await $(i.daemonLockFile,i.rootDir)}catch(t){console.error(t instanceof Error?t.message:t),process.exit(1)}R(),a.info("main",`grix-connector starting (PID ${process.pid})`),await f(i.daemonStatusFile,{state:"starting",pid:process.pid,updated_at:Date.now()});const e=parseInt(s["health-port"]??process.env.GRIX_HEALTH_PORT??"19579",10);await d.start(e),process.on("SIGINT",()=>u("SIGINT")),process.on("SIGTERM",()=>u("SIGTERM")),process.on("uncaughtException",t=>{a.error("main",`Uncaught exception: ${t instanceof Error?t.stack:t}`),!v(t)&&u("uncaughtException")}),process.on("unhandledRejection",t=>{a.error("main",`Unhandled rejection: ${t}`),!v(t)&&u("unhandledRejection")}),d.setStatusProvider(()=>h.getAgentsStatus()),await h.start(N),await f(i.daemonStatusFile,{state:"running",pid:process.pid,updated_at:Date.now()}),process.send&&process.send("ready"),a.info("main","grix-connector ready")}P().catch(e=>{a.error("main",`Fatal: ${e}`),p(i.daemonLockFile).catch(()=>{}),l(),process.exit(1)});const A=new Set(["ECONNRESET","ECONNREFUSED","ETIMEDOUT","EPIPE","EAI_AGAIN","ENOTFOUND","EHOSTUNREACH","ENETUNREACH"]);function v(e){return e instanceof Error&&"code"in e?A.has(e.code):!1}
|