@anyforge/control 0.13.0 → 0.13.1

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-var Lc=Object.defineProperty;var Nc=(e,t,n)=>()=>{if(n)throw n[0];try{return e&&(t=e(e=0)),t}catch(r){throw n=[r],r}};var Fc=(e,t)=>{for(var n in t)Lc(e,n,{get:t[n],enumerable:!0})};var hr={};Fc(hr,{default:()=>Cp});var Cp,gr=Nc(()=>{Cp={name:"@anyforge/control",version:"0.13.0",description:"AnyForge CLI \u2014 hosted Oracle conversations, a governed LLM proxy, and a scriptable client for approvals, crews, work items and workflows.",license:"Apache-2.0",homepage:"https://anyforge.ai",repository:{type:"git",url:"git+https://github.com/pootonline/sovereign-engineering.git",directory:"packages/control/cli"},publishConfig:{access:"public"},type:"module",main:"dist/cli.js",bin:{anyforge:"dist/cli.js",control:"dist/cli.js"},files:["dist","README.md"],scripts:{build:"esbuild src/cli.ts --bundle --minify --platform=node --format=esm --outfile=dist/cli.js --packages=external && chmod +x dist/cli.js && esbuild src/opencodePlugin/plugin.ts --bundle --platform=node --format=esm --outfile=dist/opencode-plugin.js","type-check":"tsc --noEmit",test:"npm run build && node scripts/test.mjs",dev:"tsx src/cli.ts",prepublishOnly:"npm run build","publish:beta":"npm publish --access public --tag beta","publish:stable":"npm publish --access public"},engines:{node:">=22.19.0"},dependencies:{"@agentclientprotocol/sdk":"^1.9.0","@earendil-works/pi-tui":"^1.0.2",kleur:"^4.1.5",open:"^11.0.4",prompts:"^2.4.2","proper-lockfile":"^4.1.2"},devDependencies:{"@types/node":"^22.20.0","@types/prompts":"^2.4.9","@types/proper-lockfile":"^4.1.4",esbuild:"^0.28.2","node-pty":"^1.1.0",tsx:"^4.7.0",typescript:"^7.0.2"}}});import{red as hc,yellow as wf,dim as Ze,bold as G}from"kleur/colors";import{execFileSync as Cr}from"child_process";import Vc from"open";import ot from"prompts";import{green as it,dim as $,bold as se,yellow as Ae,cyan as on}from"kleur/colors";import{promises as Ln}from"fs";import{homedir as qc}from"os";import{join as Zo}from"path";var ei=Zo(qc(),".anyforge"),xr=Zo(ei,"credentials");async function ti(e){await Ln.mkdir(ei,{recursive:!0,mode:448}),await Ln.writeFile(xr,JSON.stringify(e,null,2),{mode:384})}async function _t(){try{let e=await Ln.readFile(xr,"utf8");return JSON.parse(e)}catch(e){if(e.code==="ENOENT")return null;throw e}}async function ni(){try{return await Ln.unlink(xr),!0}catch(e){if(e.code==="ENOENT")return!1;throw e}}import{promises as B}from"fs";import{execFileSync as Dc}from"child_process";import{homedir as Te}from"os";import{join as X}from"path";import Et from"prompts";import{dim as H,green as Nn,yellow as nt}from"kleur/colors";import{promises as fe}from"node:fs";import{execFileSync as Mc}from"node:child_process";import{homedir as Ce}from"node:os";import{dirname as Sr,join as me}from"node:path";import{fileURLToPath as Uc}from"node:url";function Zt(e=Ce(),t=process.env){return me(t.XDG_CONFIG_HOME||me(e,".config"),"opencode")}function oi(e=Ce(),t=process.env){return me(t.XDG_DATA_HOME||me(e,".local","share"),"opencode")}async function It(e=Ce()){if(await ri(Zt(e))||await ri(oi(e)))return!0;try{return Mc("opencode",["--version"],{stdio:["ignore","pipe","pipe"],timeout:5e3}),!0}catch{return!1}}async function ii(e=Ce()){try{return JSON.parse(await fe.readFile(me(oi(e),"auth.json"),"utf8")).anthropic?.type==="oauth"}catch{return!1}}async function en(e=Ce()){let t=Zt(e);for(let n of["opencode.json","opencode.jsonc"]){let r=me(t,n),o;try{o=await fe.readFile(r,"utf8")}catch{continue}if(!o.trim())return{path:r,config:{}};try{let i=JSON.parse(o);return{path:r,config:T(i)?i:null}}catch{return{path:r,config:null}}}return{path:me(t,"opencode.json"),config:{}}}async function tn(e,t){await fe.mkdir(me(e,".."),{recursive:!0});let n=t.$schema?t:{$schema:"https://opencode.ai/config.json",...t};await fe.writeFile(e,JSON.stringify(n,null,2)+`
+var Lc=Object.defineProperty;var Nc=(e,t,n)=>()=>{if(n)throw n[0];try{return e&&(t=e(e=0)),t}catch(r){throw n=[r],r}};var Fc=(e,t)=>{for(var n in t)Lc(e,n,{get:t[n],enumerable:!0})};var hr={};Fc(hr,{default:()=>Cp});var Cp,gr=Nc(()=>{Cp={name:"@anyforge/control",version:"0.13.1",description:"AnyForge CLI \u2014 hosted Oracle conversations, a governed LLM proxy, and a scriptable client for approvals, crews, work items and workflows.",license:"Apache-2.0",homepage:"https://anyforge.ai",repository:{type:"git",url:"git+https://github.com/pootonline/sovereign-engineering.git",directory:"packages/control/cli"},publishConfig:{access:"public"},type:"module",main:"dist/cli.js",bin:{anyforge:"dist/cli.js",control:"dist/cli.js"},files:["dist","README.md"],scripts:{build:"esbuild src/cli.ts --bundle --minify --platform=node --format=esm --outfile=dist/cli.js --packages=external && chmod +x dist/cli.js && esbuild src/opencodePlugin/plugin.ts --bundle --platform=node --format=esm --outfile=dist/opencode-plugin.js","type-check":"tsc --noEmit",test:"npm run build && node scripts/test.mjs",dev:"tsx src/cli.ts",prepublishOnly:"npm run build","publish:beta":"npm publish --access public --tag beta","publish:stable":"npm publish --access public"},engines:{node:">=22.19.0"},dependencies:{"@agentclientprotocol/sdk":"^1.9.0","@earendil-works/pi-tui":"^1.0.2",kleur:"^4.1.5",open:"^11.0.4",prompts:"^2.4.2","proper-lockfile":"^4.1.2"},devDependencies:{"@types/node":"^22.20.0","@types/prompts":"^2.4.9","@types/proper-lockfile":"^4.1.4",esbuild:"^0.28.2","node-pty":"^1.1.0",tsx:"^4.7.0",typescript:"^7.0.2"}}});import{red as hc,yellow as wf,dim as Ze,bold as G}from"kleur/colors";import{execFileSync as Cr}from"child_process";import Vc from"open";import ot from"prompts";import{green as it,dim as $,bold as se,yellow as Ae,cyan as on}from"kleur/colors";import{promises as Ln}from"fs";import{homedir as qc}from"os";import{join as Zo}from"path";var ei=Zo(qc(),".anyforge"),xr=Zo(ei,"credentials");async function ti(e){await Ln.mkdir(ei,{recursive:!0,mode:448}),await Ln.writeFile(xr,JSON.stringify(e,null,2),{mode:384})}async function _t(){try{let e=await Ln.readFile(xr,"utf8");return JSON.parse(e)}catch(e){if(e.code==="ENOENT")return null;throw e}}async function ni(){try{return await Ln.unlink(xr),!0}catch(e){if(e.code==="ENOENT")return!1;throw e}}import{promises as B}from"fs";import{execFileSync as Dc}from"child_process";import{homedir as Te}from"os";import{join as X}from"path";import Et from"prompts";import{dim as H,green as Nn,yellow as nt}from"kleur/colors";import{promises as fe}from"node:fs";import{execFileSync as Mc}from"node:child_process";import{homedir as Ce}from"node:os";import{dirname as Sr,join as me}from"node:path";import{fileURLToPath as Uc}from"node:url";function Zt(e=Ce(),t=process.env){return me(t.XDG_CONFIG_HOME||me(e,".config"),"opencode")}function oi(e=Ce(),t=process.env){return me(t.XDG_DATA_HOME||me(e,".local","share"),"opencode")}async function It(e=Ce()){if(await ri(Zt(e))||await ri(oi(e)))return!0;try{return Mc("opencode",["--version"],{stdio:["ignore","pipe","pipe"],timeout:5e3}),!0}catch{return!1}}async function ii(e=Ce()){try{return JSON.parse(await fe.readFile(me(oi(e),"auth.json"),"utf8")).anthropic?.type==="oauth"}catch{return!1}}async function en(e=Ce()){let t=Zt(e);for(let n of["opencode.json","opencode.jsonc"]){let r=me(t,n),o;try{o=await fe.readFile(r,"utf8")}catch{continue}if(!o.trim())return{path:r,config:{}};try{let i=JSON.parse(o);return{path:r,config:T(i)?i:null}}catch{return{path:r,config:null}}}return{path:me(t,"opencode.json"),config:{}}}async function tn(e,t){await fe.mkdir(me(e,".."),{recursive:!0});let n=t.$schema?t:{$schema:"https://opencode.ai/config.json",...t};await fe.writeFile(e,JSON.stringify(n,null,2)+`
 `,{mode:384}),await fe.chmod(e,384).catch(()=>{})}function si(e){if(T(e.providers))return!0;let t=e.mcp;return T(t)&&T(t.servers)}function Rr(e){return`${e}/v1/anthropic/v1`}function ai(e,t,n){let r=Rr(t),o=`Bearer ${n}`;if(si(e)){let l=T(e.providers)?e.providers:{},d=T(l.anthropic)?l.anthropic:{},u=T(d.settings)?d.settings:{},y=T(d.headers)?d.headers:{};return{...e,providers:{...l,anthropic:{...d,settings:{...u,baseURL:r,apiKey:n},headers:{...y,Authorization:o}}}}}let i=T(e.provider)?e.provider:{},s=T(i.anthropic)?i.anthropic:{},a=T(s.options)?s.options:{},c=T(a.headers)?a.headers:{};return{...e,provider:{...i,anthropic:{...s,options:{...a,baseURL:r,apiKey:n,headers:{...c,Authorization:o}}}}}}function _r(e){let t=T(e.providers)&&T(e.providers.anthropic)&&T(e.providers.anthropic.settings)?e.providers.anthropic.settings.baseURL:void 0,n=T(e.provider)&&T(e.provider.anthropic)&&T(e.provider.anthropic.options)?e.provider.anthropic.options.baseURL:void 0,r=t??n;return typeof r=="string"?r:null}function Ir(e){let t=e.mcp;return T(t)?T(t.servers)&&T(t.servers.anyforge)||T(t.anyforge):!1}function ci(e,t){if(Ir(e))return e;let n=`${t}/api/mcp`,r=T(e.mcp)?e.mcp:{};if(si(e)){let o=T(r.servers)?r.servers:{};return{...e,mcp:{...r,servers:{...o,anyforge:{type:"remote",url:n}}}}}return{...e,mcp:{...r,anyforge:{type:"remote",url:n,enabled:!0}}}}function li(e,t){let n=_r(e);if(!n||!t(n))return null;let r={...e},o=(i,s)=>{let a=r[i];if(!T(a)||!T(a.anthropic))return;let c={...a.anthropic};if(T(c[s])){let d={...c[s]};if(typeof d.baseURL=="string"&&t(d.baseURL)&&(delete d.baseURL,delete d.apiKey,T(d.headers))){let u={...d.headers};delete u.Authorization,Object.keys(u).length?d.headers=u:delete d.headers}Object.keys(d).length?c[s]=d:delete c[s]}if(i==="providers"&&T(c.headers)){let d={...c.headers};typeof d.Authorization=="string"&&d.Authorization.startsWith("Bearer sk_anyforge")&&delete d.Authorization,Object.keys(d).length?c.headers=d:delete c.headers}let l={...a};Object.keys(c).length?l.anthropic=c:delete l.anthropic,Object.keys(l).length?r[i]=l:delete r[i]};return o("providers","settings"),o("provider","options"),r}function T(e){return typeof e=="object"&&e!==null&&!Array.isArray(e)}async function ri(e){try{return await fe.access(e),!0}catch{return!1}}function di(e=Ce()){return me(Zt(e),"plugins","anyforge-telemetry.js")}function ui(e=Ce()){return me(e,".anyforge","opencode-telemetry.json")}async function jc(){let e=Sr(Uc(import.meta.url));for(let t of[me(e,"opencode-plugin.js"),me(e,"..","..","dist","opencode-plugin.js")])try{return await fe.readFile(t,"utf8")}catch{}throw new Error("The OpenCode plugin is missing from this CLI build (dist/opencode-plugin.js).")}async function pi(e){let t=e.home??Ce(),n=di(t);await fe.mkdir(Sr(n),{recursive:!0}),await fe.writeFile(n,await jc());let r=ui(t);return await fe.mkdir(Sr(r),{recursive:!0,mode:448}),await fe.writeFile(r,JSON.stringify({sendNames:e.sendNames},null,2)+`
 `,{mode:384}),n}async function fi(e=Ce()){let t=[];for(let n of[di(e),ui(e)])try{await fe.unlink(n),t.push(n)}catch{}return t}var He="# === AnyForge Control \u2014 added by `anyforge init` ===",nn="# === end AnyForge Control ===",rt=".anyforge-bak",Bc=/claude_(max|pro|team|enterprise)/i,Wc=["CLAUDE_CODE_ENABLE_TELEMETRY","OTEL_METRICS_EXPORTER","OTEL_EXPORTER_OTLP_PROTOCOL","OTEL_EXPORTER_OTLP_ENDPOINT","OTEL_EXPORTER_OTLP_HEADERS","OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"];async function yi(e){let t=[],n=await Gc(e);if(n&&t.push(n),e.scope==="repo"){let o=await zc(e);return o&&t.push(o),await It()&&(console.log(H("  OpenCode is patched only globally (a project opencode.json is usually committed).")),console.log(H('  Re-run outside a repo, or choose "global", to route OpenCode through AnyForge.'))),t}let r=await Hc(e);r&&t.push(r);for(let o of Jc){let i=await o.detect();if(!(!i||!(await Et({type:"confirm",name:"go",message:`Patch ${o.label} via shell rc (${H(i.path)}) ?`,initial:!0})).go))try{await o.patch(i,e),t.push({label:o.label,path:i.path}),console.log(Nn("  \u2714")+" "+o.label)}catch(a){console.warn("  \u26A0 Skipped "+o.label+": "+a.message)}}return t}async function Gc(e){let t=e.scope==="repo"&&e.repoRoot?{dir:X(e.repoRoot,".claude"),file:"settings.local.json"}:{dir:X(Te(),".claude"),file:"settings.json"},n=X(t.dir,t.file);if(!(await Et({type:"confirm",name:"go",message:`Patch Claude Code config at ${H(n)} ?`,initial:!0})).go)return null;await B.mkdir(t.dir,{recursive:!0});let o=await B.readFile(n,"utf8").catch(()=>"{}"),i;try{i=JSON.parse(o)}catch{i={}}let s=i.env??{},a=s.ANTHROPIC_BASE_URL;return a&&!a.includes(e.endpoint)&&(a.includes("localhost")||a.includes("127.0.0.1")||a.includes("0.0.0.0"))&&(console.log(),console.log(nt("  \u26A0 Local LLM proxy detected: ")+H(a)),console.log(H("    AnyForge only routes Anthropic Claude models. Local models (Ollama,")),console.log(H("    LM Studio, etc.) will not work in Claude Code after this patch.")),console.log(H("    To restore: remove ANTHROPIC_BASE_URL and ANTHROPIC_AUTH_TOKEN")),console.log(H(`    from ${n}`)),console.log(),!(await Et({type:"confirm",name:"go",message:"Overwrite existing local LLM proxy config?",initial:!1})).go)?null:(await Oe(n)&&!await Oe(n+rt)&&await B.copyFile(n,n+rt),s.ANTHROPIC_BASE_URL=`${e.endpoint}/v1/anthropic`,s.ANTHROPIC_AUTH_TOKEN=e.apiKey,delete s.ANTHROPIC_API_KEY,i.env=s,await B.writeFile(n,JSON.stringify(i,null,2)+`
 `),console.log(Nn("  \u2714")+" Claude Code"),{label:e.scope==="repo"?"Claude Code (repo)":"Claude Code (global)",path:n})}async function Hc(e){if(!await It())return null;if(await ii())return console.log(nt("  \u26A0 OpenCode is signed in to Anthropic with a Claude subscription.")),console.log(H("    Routing it through AnyForge would replace that login, so OpenCode was not patched.")),null;let t=await en();if(t.config===null)return console.log(nt("  \u26A0 "+t.path+" is not plain JSON (comments?), so it was not changed.")),console.log(H('    To route OpenCode through AnyForge, add to its "provider" section:')),console.log(H(`    "anthropic": { "options": { "baseURL": "${Rr(e.endpoint)}", "apiKey": "<your AnyForge key>",`)),console.log(H('      "headers": { "Authorization": "Bearer <your AnyForge key>" } } }')),null;let n=_r(t.config);return n&&!rn(n,Er(e.endpoint))&&(console.log(nt("  \u26A0 OpenCode already sends Anthropic requests to ")+H(n)),!(await Et({type:"confirm",name:"go",message:"Replace it with the AnyForge proxy?",initial:!1})).go)||!(await Et({type:"confirm",name:"go",message:`Patch OpenCode config at ${H(t.path)} ?`,initial:!0})).go?null:(await tn(t.path,ai(t.config,e.endpoint,e.apiKey)),console.log(Nn("  \u2714")+" OpenCode"),{label:"OpenCode (global)",path:t.path})}async function vi(e){let t=X(Te(),".claude"),n=X(t,"settings.json");await B.mkdir(t,{recursive:!0});let r=await B.readFile(n,"utf8").catch(()=>"{}"),o;try{o=JSON.parse(r)}catch{o={}}let i=o.env??{},s=i.OTEL_EXPORTER_OTLP_ENDPOINT;return s&&!rn(s,Er(e.endpoint))?(console.log(nt("  \u26A0 An OpenTelemetry endpoint is already configured: ")+H(s)),console.log(H("    Leaving it untouched. To send Claude Code usage to AnyForge, point")),console.log(H("    OTEL_EXPORTER_OTLP_ENDPOINT at "+e.endpoint+"/api/otel")),null):(await Oe(n)&&!await Oe(n+rt)&&await B.copyFile(n,n+rt),i.CLAUDE_CODE_ENABLE_TELEMETRY="1",i.OTEL_METRICS_EXPORTER="otlp",i.OTEL_LOGS_EXPORTER===void 0&&i.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT===void 0&&(i.OTEL_LOGS_EXPORTER="otlp",e.toolDetails&&i.OTEL_LOG_TOOL_DETAILS===void 0&&(i.OTEL_LOG_TOOL_DETAILS="1")),i.OTEL_EXPORTER_OTLP_PROTOCOL="http/json",i.OTEL_EXPORTER_OTLP_ENDPOINT=`${e.endpoint}/api/otel`,i.OTEL_EXPORTER_OTLP_HEADERS=`Authorization=Bearer ${e.apiKey}`,i.OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE="delta",o.env=i,await B.writeFile(n,JSON.stringify(o,null,2)+`

package/dist/opencode-plugin.js

@@ -150,19 +150,55 @@ function attr(key, value) {
 function sanitize(name) {
   return name.replace(/[^a-zA-Z0-9_-]/g, "_");
 }
+function mcpPrefixesOf(server2) {
+  return [.../* @__PURE__ */ new Set([`${sanitize(server2)}_`, `${server2}_`, `${server2}.`, `${server2}/`, `${server2}:`])];
+}
+var BUILTIN_TOOLS = /* @__PURE__ */ new Set([
+  "bash",
+  "read",
+  "write",
+  "edit",
+  "multiedit",
+  "patch",
+  "apply_patch",
+  "glob",
+  "grep",
+  "list",
+  "ls",
+  "webfetch",
+  "websearch",
+  "codesearch",
+  "todowrite",
+  "todoread",
+  "task",
+  "skill",
+  "lsp",
+  "question",
+  "batch",
+  "invalid",
+  "external_directory",
+  "doom_loop"
+]);
+var UNNAMED_TOOL = "other_tool";
+var STOPPED_ERROR = /abort|cancel|interrupt/i;
 var TOOL_NAME = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,99}$/;
 var OpencodeTelemetry = class {
   constructor(options) {
     this.options = options;
-    this.mcpPrefixes = options.mcpServers.map((server) => ({ server, prefix: `${sanitize(server)}_` })).sort((a, b) => b.prefix.length - a.prefix.length);
+    this.setMcpServers(options.mcpServers);
   }
   options;
-  mcpPrefixes;
+  mcpPrefixes = [];
   models = new Remembered();
   callTools = new Remembered();
   permissionTools = new Remembered();
   reported = new Remembered();
+  toolStarts = new Remembered();
   proxiedProviders = /* @__PURE__ */ new Set();
+  /** The configured MCP servers, which V2 reports after the plugin has started. */
+  setMcpServers(servers) {
+    this.mcpPrefixes = servers.flatMap((server2) => mcpPrefixesOf(server2).map((prefix) => ({ server: server2, prefix }))).sort((a, b) => b.prefix.length - a.prefix.length);
+  }
   /** `chat.message`: the member sent a prompt. Its text is never read. */
   prompt(nowMs) {
     return { logs: [this.record("user_prompt", nowMs, [])], usage: [] };
@@ -225,14 +261,24 @@ var OpencodeTelemetry = class {
     if (part.type === "tool") return this.tool(part, id, nowMs);
     return EMPTY;
   }
-  /** One finished model call: an `api_request`, and its tokens unless the proxy metered them. */
+  /** One finished model call (V1 `step-finish` part). */
   step(part, id, nowMs) {
-    if (this.reported.has(`step:${id}`)) return EMPTY;
-    this.reported.set(`step:${id}`, true);
-    const model = this.models.get(str(part.messageID) ?? "");
-    const logs = [this.record("api_request", nowMs, model ? [attr("model", model.modelID)] : [])];
-    if (model && this.proxiedProviders.has(model.providerID)) return { logs, usage: [] };
-    const tokens = isRecord(part.tokens) ? part.tokens : {};
+    return this.modelCall(`step:${id}`, str(part.messageID), part.tokens, part.cost, "api_request", nowMs);
+  }
+  /**
+   * One model call: an `api_request` (or `api_error`) and its tokens, unless
+   * the AnyForge proxy already metered them. Reported once per key.
+   */
+  modelCall(key, messageID, rawTokens, cost, event, nowMs) {
+    if (this.reported.has(key)) return EMPTY;
+    this.reported.set(key, true);
+    const model = this.models.get(messageID ?? "");
+    const logs = [this.record(event, nowMs, model ? [attr("model", model.modelID)] : [])];
+    return { logs, usage: this.usage(model, rawTokens, cost) };
+  }
+  usage(model, rawTokens, cost) {
+    if (model && this.proxiedProviders.has(model.providerID)) return [];
+    const tokens = isRecord(rawTokens) ? rawTokens : {};
     const cache = isRecord(tokens.cache) ? tokens.cache : {};
     const reading = {
       model: model?.modelID ?? "unknown",
@@ -241,10 +287,85 @@ var OpencodeTelemetry = class {
       output: num(tokens.output) + num(tokens.reasoning),
       cacheRead: num(cache.read),
       cacheWrite: num(cache.write),
-      costUsd: num(part.cost)
+      costUsd: num(cost)
     };
     const any = reading.input + reading.output + reading.cacheRead + reading.cacheWrite + reading.costUsd > 0;
-    return { logs, usage: any ? [reading] : [] };
+    return any ? [reading] : [];
+  }
+  // ── OpenCode V2 ──────────────────────────────────────────────────────────
+  /** One V2 session or permission event, `{ id, type, data }`. */
+  eventV2(event, nowMs) {
+    if (!isRecord(event) || !isRecord(event.data)) return EMPTY;
+    const data = event.data;
+    const eventId = str(event.id);
+    switch (event.type) {
+      case "session.inbox.enqueued": {
+        const inboxID = str(data.inboxID);
+        if (!isRecord(data.item) || data.item.type !== "user" || !inboxID || this.reported.has(`prompt:${inboxID}`)) return EMPTY;
+        this.reported.set(`prompt:${inboxID}`, true);
+        return this.prompt(nowMs);
+      }
+      case "session.step.started": {
+        const messageID = str(data.assistantMessageID);
+        const model = isRecord(data.model) ? data.model : {};
+        const modelID = str(model.id);
+        const providerID = str(model.providerID);
+        if (messageID && modelID && providerID) this.models.set(messageID, { modelID, providerID });
+        return EMPTY;
+      }
+      case "session.step.ended":
+        if (!eventId) return EMPTY;
+        return this.modelCall(`step2:${eventId}`, str(data.assistantMessageID), data.tokens, data.cost, "api_request", nowMs);
+      case "session.step.failed": {
+        if (!eventId) return EMPTY;
+        const error = isRecord(data.error) ? data.error : {};
+        if (STOPPED_ERROR.test(str(error.type) ?? "")) {
+          this.reported.set(`step2:${eventId}`, true);
+          return { logs: [], usage: this.usage(this.models.get(str(data.assistantMessageID) ?? ""), data.tokens, data.cost) };
+        }
+        return this.modelCall(`step2:${eventId}`, str(data.assistantMessageID), data.tokens, data.cost, "api_error", nowMs);
+      }
+      case "session.skill.activated": {
+        if (!eventId || this.reported.has(`skill:${eventId}`)) return EMPTY;
+        this.reported.set(`skill:${eventId}`, true);
+        return { logs: [this.record("skill_activated", nowMs, [attr("skill.name", this.skillName({ name: data.name }))])], usage: [] };
+      }
+      case "permission.asked": {
+        const source = isRecord(data.source) ? data.source : {};
+        this.notePermission(str(data.id), str(source.id), str(data.action));
+        return EMPTY;
+      }
+      case "permission.replied":
+        return this.decision(str(data.requestID), str(data.reply), nowMs);
+      default:
+        return EMPTY;
+    }
+  }
+  /** V2 `tool` hook `execute.before`: remember the call's tool and start time. */
+  toolStarted(callID, tool, nowMs) {
+    const id = str(callID);
+    const name = str(tool);
+    if (!id || !name) return;
+    this.callTools.set(id, name);
+    this.toolStarts.set(id, nowMs);
+  }
+  /** V2 `tool` hook `execute.after`: one finished call. V2 reports skills as their own event. */
+  toolEnded(callID, tool, status, nowMs) {
+    const id = str(callID);
+    const name = str(tool) ?? (id ? this.callTools.get(id) : void 0);
+    if (!id || !name || status !== "completed" && status !== "error") return EMPTY;
+    if (this.reported.has(`tool2:${id}`)) return EMPTY;
+    this.reported.set(`tool2:${id}`, true);
+    const started = this.toolStarts.get(id);
+    const duration = started === void 0 ? 0 : nowMs - started;
+    return {
+      logs: [this.record("tool_result", nowMs, [
+        ...this.toolAttributes(name),
+        attr("success", status === "completed"),
+        ...duration > 0 && duration < 864e5 ? [attr("duration_ms", Math.round(duration))] : []
+      ])],
+      usage: []
+    };
   }
   tool(part, id, nowMs) {
     const tool = str(part.tool);
@@ -294,7 +415,8 @@ var OpencodeTelemetry = class {
       const name = this.options.sendNames ? `mcp__${mcp.server}__${tool.slice(mcp.prefix.length)}` : "mcp_tool";
       return [attr("tool_name", TOOL_NAME.test(name) ? name : "mcp_tool"), attr("tool_source", "mcp")];
     }
-    return TOOL_NAME.test(tool) ? [attr("tool_name", tool), attr("tool_source", "builtin")] : [attr("tool_source", "builtin")];
+    const named = this.options.sendNames ? TOOL_NAME.test(tool) : BUILTIN_TOOLS.has(tool);
+    return [attr("tool_name", named ? tool : UNNAMED_TOOL), attr("tool_source", "builtin")];
   }
   skillName(input) {
     const name = isRecord(input) ? str(input.name) : void 0;
@@ -335,24 +457,20 @@ async function mcpServerNames(input) {
     return [];
   }
 }
-var AnyforgeTelemetry = async (input) => {
+async function start(mcpServers) {
   const anyforgeDir = join(homedir(), ".anyforge");
   const creds = await readJson(join(anyforgeDir, "credentials"));
   const apiKey = typeof creds?.apiKey === "string" ? creds.apiKey : null;
   const endpoint = typeof creds?.endpoint === "string" ? creds.endpoint.replace(/\/+$/, "") : null;
-  if (!apiKey || !endpoint) return {};
-  let anyforgeHost = null;
+  if (!apiKey || !endpoint) return null;
+  let anyforgeHost;
   try {
     anyforgeHost = new URL(endpoint).host;
   } catch {
-    return {};
+    return null;
   }
   const settings = await readJson(join(anyforgeDir, "opencode-telemetry.json"));
-  const telemetry = new OpencodeTelemetry({
-    sendNames: settings?.sendNames === true,
-    mcpServers: await mcpServerNames(input),
-    anyforgeHost
-  });
+  const telemetry = new OpencodeTelemetry({ sendNames: settings?.sendNames === true, mcpServers, anyforgeHost });
   const exporter = new TelemetryExporter({
     endpoint,
     apiKey,
@@ -363,36 +481,87 @@ var AnyforgeTelemetry = async (input) => {
     void exporter.flush();
   }, FLUSH_INTERVAL_MS);
   timer.unref?.();
-  const take = (t) => {
-    exporter.addLogs(t.logs);
-    exporter.addUsage(t.usage);
-  };
   return {
-    "chat.message": async () => {
-      try {
-        take(telemetry.prompt(Date.now()));
-      } catch {
-      }
-    },
-    "chat.params": async (params) => {
-      try {
-        telemetry.provider(params?.provider?.info?.id, params?.provider?.options?.baseURL);
-      } catch {
-      }
-    },
-    event: async ({ event }) => {
-      try {
-        take(telemetry.event(event, Date.now()));
-        if (event?.type === "session.idle") void exporter.flush();
-      } catch {
-      }
+    telemetry,
+    exporter,
+    take: (t) => {
+      exporter.addLogs(t.logs);
+      exporter.addUsage(t.usage);
     },
-    dispose: async () => {
+    stop: async () => {
       clearInterval(timer);
       await exporter.flush();
     }
   };
-};
+}
+function quietly(step) {
+  try {
+    step();
+  } catch {
+  }
+}
+async function server(input) {
+  const run = await start(await mcpServerNames(input));
+  if (!run) return {};
+  const { telemetry, take, exporter } = run;
+  return {
+    "chat.message": async () => quietly(() => take(telemetry.prompt(Date.now()))),
+    "chat.params": async (params) => quietly(() => telemetry.provider(params?.provider?.info?.id, params?.provider?.options?.baseURL)),
+    event: async ({ event }) => quietly(() => {
+      take(telemetry.event(event, Date.now()));
+      if (event?.type === "session.idle") void exporter.flush();
+    }),
+    dispose: () => run.stop()
+  };
+}
+var V2_EVENTS = [
+  "session.inbox.enqueued",
+  "session.step.started",
+  "session.step.ended",
+  "session.step.failed",
+  "session.skill.activated",
+  "session.execution.succeeded",
+  "session.execution.failed",
+  "permission.asked",
+  "permission.replied"
+];
+async function setup(ctx) {
+  const run = await start([]);
+  if (!run) return;
+  const { telemetry, take, exporter } = run;
+  const registrations = [];
+  const register = async (registering) => {
+    try {
+      registrations.push(await registering());
+    } catch {
+    }
+  };
+  await register(() => ctx.mcp.transform((editor) => quietly(() => telemetry.setMcpServers(editor.list().map(([name]) => name)))));
+  await register(() => ctx.session.hook("model.request", (input) => quietly(() => telemetry.provider(input?.model?.providerID, input?.baseURL))));
+  await register(() => ctx.tool.hook("execute.before", (input) => quietly(() => telemetry.toolStarted(input?.id, input?.tool, Date.now()))));
+  await register(() => ctx.tool.hook("execute.after", (input) => quietly(() => take(telemetry.toolEnded(input?.id, input?.tool, input?.status, Date.now())))));
+  const abort = new AbortController();
+  void (async () => {
+    try {
+      for await (const event of ctx.event.subscribe({ types: V2_EVENTS, signal: abort.signal })) {
+        quietly(() => {
+          take(telemetry.eventV2(event, Date.now()));
+          const type = event?.type;
+          if (type === "session.execution.succeeded" || type === "session.execution.failed") void exporter.flush();
+        });
+      }
+    } catch {
+    }
+  })();
+  return async () => {
+    abort.abort();
+    await Promise.all(registrations.map((r) => r.dispose().catch(() => {
+    })));
+    await run.stop();
+  };
+}
+var AnyforgeTelemetry = { id: "anyforge-telemetry", setup, server };
+var plugin_default = AnyforgeTelemetry;
 export {
-  AnyforgeTelemetry
+  plugin_default as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anyforge/control",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "AnyForge CLI — hosted Oracle conversations, a governed LLM proxy, and a scriptable client for approvals, crews, work items and workflows.",
   "license": "Apache-2.0",
   "homepage": "https://anyforge.ai",