@agentdeploymentco/bishop 0.1.0 → 0.3.0

package/dist/turn.js

@@ -1 +1 @@
-import{log as i}from"./log.js";function u(o){const d=new Map,l=new Set;async function g(e){const r=o.sharedDirNotice;if(!(!r||l.has(e.threadKey))){l.add(e.threadKey);try{await e.notify(r)}catch(n){i.debug({thread:e.threadKey,err:n},"could not deliver the shared-directory notice")}}}function w(e,r){if(!(!o.tools||e.tools===!1))return o.tools.grant({threadKey:e.threadKey,principal:r,origin:e.origin,destination:()=>e.destination()})}async function K(e){await g(e);const r=new AbortController,n=e.presence();let h;try{d.set(e.threadKey,r);const a=e.freshSession?void 0:await o.sessions.get(e.threadKey),s=await o.workspaceFor?.(e.threadKey)??e.threadKey,m=await o.cwd(s),[p,y]=await Promise.all([e.messages(),a?void 0:e.history?.().catch(t=>{i.warn({thread:e.threadKey,err:t},"could not read the history")})]),[c,...f]=p;if(!c)throw new Error("a turn with no messages");const b=f.at(-1)?.principal??c.principal;if(r.signal.aborted){i.info({thread:e.threadKey},"turn stopped before the agent started");return}h=w(e,b);for await(const t of o.harness.runTurn({messages:[c,...f],cwd:m,threadKey:e.threadKey,...s===e.threadKey?{}:{workspaceKey:s},...a?{sessionId:a}:{},...e.note?{note:e.note}:{},...y?.length?{history:y}:{},origin:e.origin,...h?{tools:h.access}:{},signal:r.signal}))t.type==="session"&&t.sessionId!==a&&await o.sessions.set(e.threadKey,t.sessionId),t.type==="text"&&i.debug({thread:e.threadKey,chars:t.text.length},"agent said something"),t.type==="tool"&&i.debug({thread:e.threadKey,tool:t.name,detail:t.summary??t.detail},"tool activity"),t.type==="done"&&i.info({thread:e.threadKey,...t.usage},"turn complete"),t.type==="error"&&i.error({thread:e.threadKey,kind:t.kind,err:t.message},"turn errored"),await n.handle(t)}catch(a){const s=a instanceof Error?a.message:String(a);throw i.error({thread:e.threadKey,err:a},"turn failed before the agent answered"),await n.handle({type:"error",kind:"turn_failed",message:s}),a}finally{h?.revoke(),d.get(e.threadKey)===r&&d.delete(e.threadKey),await n.finish()}}return{run:K,stop(e){const r=d.get(e);return r?(r.abort(),!0):!1}}}export{u as makeTurnRunner};
+import{log as o}from"./log.js";import{worktreeName as b}from"./worktrees.js";function v(i){const s=new Map,l=new Set;async function y(e){const r=i.sharedDirNotice;if(!(!r||l.has(e.thread.threadKey))){l.add(e.thread.threadKey);try{await e.notify(r)}catch(n){o.debug({thread:e.thread.threadKey,err:n},"could not deliver the shared-directory notice")}}}function w(e,r){if(!(!i.tools||e.tools===!1))return i.tools.grant({thread:e.thread,principal:r,origin:e.origin,destination:()=>e.destination()})}async function m(e){await y(e);const r=new AbortController,n=e.presence();let d;try{s.set(e.thread.threadKey,r);const a=e.freshSession?void 0:await i.sessions.get(e.thread.id),h=await i.cwd(e.thread),[p,f]=await Promise.all([e.messages(),a?void 0:e.history?.().catch(t=>{o.warn({thread:e.thread.threadKey,err:t},"could not read the history")})]),[c,...g]=p;if(!c)throw new Error("a turn with no messages");const K=g.at(-1)?.principal??c.principal;if(r.signal.aborted){o.info({thread:e.thread.threadKey},"turn stopped before the agent started");return}d=w(e,K);for await(const t of i.harness.runTurn({messages:[c,...g],cwd:h,threadKey:e.thread.threadKey,worktree:b(e.thread.dirKey),...a?{sessionId:a}:{},...e.note?{note:e.note}:{},...f?.length?{history:f}:{},origin:e.origin,...d?{tools:d.access}:{},signal:r.signal}))t.type==="session"&&t.sessionId!==a&&await i.sessions.set(e.thread.id,t.sessionId),t.type==="text"&&o.debug({thread:e.thread.threadKey,chars:t.text.length},"agent said something"),t.type==="tool"&&o.debug({thread:e.thread.threadKey,tool:t.name,detail:t.summary??t.detail},"tool activity"),t.type==="done"&&o.info({thread:e.thread.threadKey,...t.usage},"turn complete"),t.type==="error"&&o.error({thread:e.thread.threadKey,kind:t.kind,err:t.message},"turn errored"),await n.handle(t)}catch(a){const h=a instanceof Error?a.message:String(a);throw o.error({thread:e.thread.threadKey,err:a},"turn failed before the agent answered"),await n.handle({type:"error",kind:"turn_failed",message:h}),a}finally{d?.revoke(),s.get(e.thread.threadKey)===r&&s.delete(e.thread.threadKey),await n.finish()}}return{run:m,stop(e){const r=s.get(e);return r?(r.abort(),!0):!1}}}export{v as makeTurnRunner};

package/dist/worktrees.js

@@ -1,2 +1,2 @@
-import{createHash as w}from"node:crypto";import{existsSync as u,mkdirSync as p}from"node:fs";import{join as h,resolve as s}from"node:path";import{BishopError as d}from"./errors.js";import{exec as i}from"./exec.js";const l=64,c="bishop-",m=".claude/worktrees";function b(t){const r=t.replaceAll(/[^a-zA-Z0-9]+/g,"-").replaceAll(/-+/g,"-").replaceAll(/^-+|-+$/g,""),e=`${c}${r}`;if(e.length<=l)return e;const o=w("sha256").update(t).digest("hex").slice(0,8),n=l-c.length-o.length-1;return`${c}${r.slice(0,n)}-${o}`}function g(t,r){return s(t,m,r)}function I(t){return`\`${t}\` isn't a git repository, so I'm working in it directly. Another thread changing the same files at the same time can conflict.`}function N(t){return!!(t?.enabled&&t.isRepo)}function x(t){return u(h(t,".git"))}async function y(t){const r=await i("git",["rev-parse","--show-prefix"],{cwd:t});return r.code===0?r.stdout.trim():""}async function M(t,r){const e=g(t,r),o=await y(t);if(x(e))return f(e,o);if(u(e))throw new d(`${e} exists but is not a git worktree, which usually means an earlier attempt failed partway. Remove the directory and this thread will get a fresh one.`);const n=await i("git",["worktree","add","-b",r,e,"HEAD"],{cwd:t});if(n.code!==0){await i("git",["worktree","prune"],{cwd:t});const a=await i("git",["worktree","add",e,r],{cwd:t});if(a.code!==0)throw new d(`Couldn't create a git worktree for this thread at ${e}: ${k(n,a)}`)}return f(e,o)}function k(t,r){const e=t.stderr.trim(),o=r.stderr.trim();return!o||o===e?e:`${e}
-  and, retrying with the existing branch: ${o}`}function f(t,r){if(!r)return t;const e=s(t,r);return p(e,{recursive:!0}),e}async function P(t){const r=await i("git",["rev-parse","--git-common-dir"],{cwd:t}),e=r.stdout.trim();if(!(r.code!==0||!e))return s(t,e)}async function W(t){return(await i("git",["rev-parse","--show-toplevel"],{cwd:t})).code===0}async function _(t){const r=await i("git",["config","--get","user.email"],{cwd:t}),e=await i("git",["config","--get","user.name"],{cwd:t});return r.code===0&&r.stdout.trim()!==""&&e.code===0&&e.stdout.trim()!==""}export{m as WORKTREE_DIR,M as ensureWorktree,P as gitCommonDir,_ as hasGitIdentity,W as isGitRepo,N as isolates,I as sharedDirNotice,b as worktreeName,g as worktreePath};
+import{createHash as w}from"node:crypto";import{existsSync as u,mkdirSync as h}from"node:fs";import{join as p,resolve as s}from"node:path";import{BishopError as d}from"./errors.js";import{exec as n}from"./exec.js";const l=64,c="bishop-",m=".claude/worktrees";function b(t){const r=t.replaceAll(/[^a-zA-Z0-9]+/g,"-").replaceAll(/-+/g,"-").replaceAll(/^-+|-+$/g,""),e=`${c}${r}`;if(e.length<=l)return e;const o=w("sha256").update(t).digest("hex").slice(0,8),i=l-c.length-o.length-1;return`${c}${r.slice(0,i)}-${o}`}function g(t,r){return s(t,m,r)}function I(t){return`\`${t}\` isn't a git repository, so I'm working in it directly. Another thread changing the same files at the same time can conflict.`}function N(t){return!!(t?.enabled&&t.isRepo)}function x(t){return u(p(t,".git"))}async function y(t){const r=await n("git",["rev-parse","--show-prefix"],{cwd:t});return r.code===0?r.stdout.trim():""}async function M(t,r){const e=g(t,r),o=await y(t);if(x(e))return f(e,o);if(u(e))throw new d(`${e} exists but is not a git worktree, which usually means an earlier attempt failed partway. Remove the directory and this thread will get a fresh one.`);const i=await n("git",["worktree","add","-b",r,e,"HEAD"],{cwd:t});if(i.code!==0){await n("git",["worktree","prune"],{cwd:t});const a=await n("git",["worktree","add",e,r],{cwd:t});if(a.code!==0)throw new d(`Couldn't create a git worktree for this thread at ${e}: ${k(i,a)}`)}return f(e,o)}function k(t,r){const e=t.stderr.trim(),o=r.stderr.trim();return!o||o===e?e:`${e}
+  and, retrying with the existing branch: ${o}`}function f(t,r){if(!r)return t;const e=s(t,r);return h(e,{recursive:!0}),e}async function P(t){const r=await n("git",["rev-parse","--git-common-dir"],{cwd:t}),e=r.stdout.trim();if(!(r.code!==0||!e))return s(t,e)}async function W(t){return(await n("git",["rev-parse","--show-toplevel"],{cwd:t})).code===0}async function _(t){const r=await n("git",["config","--get","user.email"],{cwd:t}),e=await n("git",["config","--get","user.name"],{cwd:t});return r.code===0&&r.stdout.trim()!==""&&e.code===0&&e.stdout.trim()!==""}export{m as WORKTREE_DIR,M as ensureWorktree,P as gitCommonDir,_ as hasGitIdentity,W as isGitRepo,N as isolates,I as sharedDirNotice,b as worktreeName,g as worktreePath};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentdeploymentco/bishop",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "An agent gateway. Connects an agent to Slack and email.",
   "license": "UNLICENSED",
   "type": "module",
@@ -25,12 +25,14 @@
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest",
+    "eval:etiquette": "tsx test/etiquette-eval.ts",
     "lint": "biome check src test",
     "format": "biome check --write src test",
     "check": "npm run lint && npm run typecheck && npm test"
   },
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.3",
+    "@microsoft/teams.apps": "^2.0.16",
     "@modelcontextprotocol/sdk": "^1.30.0",
     "@openai/codex-sdk": "^0.149.1",
     "@slack/bolt": "^5.0.0",