alchemylab 1.3.4 → 1.3.5

package/dist/http-server.js

@@ -839,8 +839,10 @@ e&&s&&await o.workspaceManager.ensureReadonlyBranchIfNeeded(e,n,s,q)}catch(e){k.
 if(e?.sessionId&&t){const r=t.match(/^requests\/(.+)$/),n="1"===process.env.ALCHEMY_ALLOW_PARALLEL
 if(r&&!n){const t=r[1]
 E=!0
-try{const{sessionTag:r}=(0,g.getGlobalClientInfo)(),n=s.getSessionTagMappingClient(),o=s.getRequestClient(),i=n?n.getMappingByOpencodeSessionId(e.sessionId).then((t=>{t?((0,g.setSessionTag)(t.sessionTag),k.info("Recovered session tag from mapping",{opencodeSessionId:e.sessionId,sessionTag:t.sessionTag})):(n.createOrUpdateMapping(r,e.sessionId).catch((()=>{})),k.info("Registered session tag mapping",{opencodeSessionId:e.sessionId,sessionTag:r}))}),(e=>k.debug("Mapping lookup failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve(),a=o.lockRequest?o.lockRequest(t,r).then((e=>{e.locked?k.info("Acquired request lock",{requestId:t,sessionTag:r}):k.warn("Failed to acquire request lock",{requestId:t,sessionTag:r})}),(e=>k.warn("Lock acquisition failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve()
-await Promise.all([i,a])}catch(e){k.warn("Error in session tag mapping / lock acquisition",{error:(0,d.getErrorMessage)(e)})}}}}o&&(o.currentSessionId=q||"__unknown__")
+try{const{sessionTag:r}=(0,g.getGlobalClientInfo)(),n=s.getSessionTagMappingClient(),o=s.getRequestClient()
+let i=!1,a=null
+const c=n?n.getMappingByOpencodeSessionId(e.sessionId).then((t=>{t?((0,g.setSessionTag)(t.sessionTag),a=t.sessionTag,k.info("Recovered session tag from mapping",{opencodeSessionId:e.sessionId,sessionTag:t.sessionTag})):(n.createOrUpdateMapping(r,e.sessionId).catch((()=>{})),k.info("Registered session tag mapping",{opencodeSessionId:e.sessionId,sessionTag:r}))}),(e=>k.debug("Mapping lookup failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve(),l=o.lockRequest?o.lockRequest(t,r).then((e=>{i=e.locked,e.locked?k.info("Acquired request lock",{requestId:t,sessionTag:r}):k.warn("Failed to acquire request lock",{requestId:t,sessionTag:r})}),(e=>k.warn("Lock acquisition failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve()
+if(await Promise.all([c,l]),!i&&a&&a!==r&&o.lockRequest)try{(await o.lockRequest(t,a)).locked?k.info("Acquired lock with recovered session tag after MCP restart",{requestId:t,sessionTag:a}):k.warn("Lock still held by a different session after recovered-tag retry",{requestId:t,recoveredTag:a})}catch(e){k.warn("Lock retry with recovered tag failed",{error:(0,d.getErrorMessage)(e)})}}catch(e){k.warn("Error in session tag mapping / lock acquisition",{error:(0,d.getErrorMessage)(e)})}}}}o&&(o.currentSessionId=q||"__unknown__")
 const S=`${Date.now()}-${Math.random().toString(36).slice(2,10)}`,T=e=>{const{getActionServerBaseUrl:r}=t(9414)
 fetch(r()+"/api/mcp/tool-call-event",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({action:e,callId:S}),signal:AbortSignal.timeout(500)}).catch((()=>{}))}
 let P
@@ -4507,10 +4509,13 @@ if(n.workspaceManager){o.debug("Using WorkspaceManager for request context switc
 try{if("multi-agent"===n.workspaceManager.getCurrentContext(n.currentSessionId).mode)if(o.debug("Multi-agent mode: checking request lock before auto-switch",{requestId:r}),n.apiClient)try{const e=n.apiClient.getRequestClient(),{sessionTag:t}=(0,h.getGlobalClientInfo)()
 c=Date.now()
 const s=await e.getRequestLockStatus(r)
-if(Date.now(),s.isLocked&&s.lockedBySessionTag!==t){o.warn("Auto-switch blocked by request lock",{requestId:r,lockedByAgent:s.lockedBySessionTag,currentAgent:t,lockedAt:s.lockedAt})
-let e=`Request ${r} is currently locked by another agent (${s.lockedBySessionTag}).\n\nLocked since: ${s.lockedAt||"unknown"}\n\nIn multi-agent mode, only one agent can work on a request at a time. Please wait for the other agent to complete their work or contact an administrator if the lock appears stale.`
-if(n.lockOverrideManager&&n.configManager)try{const t=await n.configManager.getEffectiveConfig(n.mainBasePath)
-t.lockOverride.enabled&&(e+=`\n\n**To take over this request (only if safe to do so), use switch_to_branch with password: \`${n.lockOverrideManager.generatePassword(r,t.lockOverride.passwordValidityMinutes)}\` (valid for ${t.lockOverride.passwordValidityMinutes} minutes)**`)}catch(e){o.warn("Failed to check lock override config",{error:e})}throw new p.RequestLockError(e,r,s.lockedBySessionTag,s.lockedAt)}if(!s.isLocked){c=Date.now(),o.debug("Acquiring lock for auto-switch",{requestId:r,sessionTag:t})
+Date.now()
+const i=10,l=s.lockedAt?Date.now()-new Date(s.lockedAt).getTime():0,d=l>6e4*i
+if(s.isLocked&&s.lockedBySessionTag!==t&&!d){o.warn("Auto-switch blocked by request lock",{requestId:r,lockedByAgent:s.lockedBySessionTag,currentAgent:t,lockedAt:s.lockedAt,lockAgeMs:l})
+const e=Math.max(0,Math.ceil(i-l/6e4))
+let a=`Request ${r} is currently locked by another agent (${s.lockedBySessionTag}).\n\nLocked since: ${s.lockedAt||"unknown"}\n\nIn multi-agent mode, only one agent can work on a request at a time. If the holder is dead/abandoned, the lock will become takeover-eligible in ~${e} minute${1===e?"":"s"} \u2014 retry your operation then and it will succeed automatically. If the holder is genuinely active, wait for them to finish.`
+if(n.lockOverrideManager&&n.configManager)try{const e=await n.configManager.getEffectiveConfig(n.mainBasePath)
+e.lockOverride.enabled&&(a+=`\n\nIf you cannot wait, switch_to_branch with password: \`${n.lockOverrideManager.generatePassword(r,e.lockOverride.passwordValidityMinutes)}\` (valid for ${e.lockOverride.passwordValidityMinutes} minutes) \u2014 ONLY if you are certain the holder is dead.`)}catch(e){o.warn("Failed to check lock override config",{error:e})}throw new p.RequestLockError(a,r,s.lockedBySessionTag,s.lockedAt)}if(d&&s.lockedBySessionTag!==t&&o.info("Stale lock detected \u2014 DAO will take it over on next acquire",{requestId:r,staleBySessionTag:s.lockedBySessionTag,lockAgeMs:l}),!s.isLocked||d){c=Date.now(),o.debug("Acquiring lock for auto-switch",{requestId:r,sessionTag:t})
 const n=await e.lockRequest(r,t)
 if(Date.now(),!n.locked){const e=`Failed to acquire lock for request ${r} during auto-switch`
 throw o.warn("Auto-switch lock acquisition failed",{requestId:r}),Error(e)}o.info("Successfully acquired lock for auto-switch",{requestId:r,sessionTag:t,lockedAt:n.lockedAt}),a=!0}}catch(e){throw o.error("Lock check/acquisition failed during auto-switch",{requestId:r,error:e instanceof Error?e.message:e+""}),e}else o.warn("Multi-agent mode but no API client available for locking",{requestId:r})

package/dist/index.js

@@ -841,8 +841,10 @@ e&&s&&await o.workspaceManager.ensureReadonlyBranchIfNeeded(e,n,s,q)}catch(e){k.
 if(e?.sessionId&&t){const r=t.match(/^requests\/(.+)$/),n="1"===process.env.ALCHEMY_ALLOW_PARALLEL
 if(r&&!n){const t=r[1]
 E=!0
-try{const{sessionTag:r}=(0,g.getGlobalClientInfo)(),n=s.getSessionTagMappingClient(),o=s.getRequestClient(),i=n?n.getMappingByOpencodeSessionId(e.sessionId).then((t=>{t?((0,g.setSessionTag)(t.sessionTag),k.info("Recovered session tag from mapping",{opencodeSessionId:e.sessionId,sessionTag:t.sessionTag})):(n.createOrUpdateMapping(r,e.sessionId).catch((()=>{})),k.info("Registered session tag mapping",{opencodeSessionId:e.sessionId,sessionTag:r}))}),(e=>k.debug("Mapping lookup failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve(),a=o.lockRequest?o.lockRequest(t,r).then((e=>{e.locked?k.info("Acquired request lock",{requestId:t,sessionTag:r}):k.warn("Failed to acquire request lock",{requestId:t,sessionTag:r})}),(e=>k.warn("Lock acquisition failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve()
-await Promise.all([i,a])}catch(e){k.warn("Error in session tag mapping / lock acquisition",{error:(0,d.getErrorMessage)(e)})}}}}o&&(o.currentSessionId=q||"__unknown__")
+try{const{sessionTag:r}=(0,g.getGlobalClientInfo)(),n=s.getSessionTagMappingClient(),o=s.getRequestClient()
+let i=!1,a=null
+const c=n?n.getMappingByOpencodeSessionId(e.sessionId).then((t=>{t?((0,g.setSessionTag)(t.sessionTag),a=t.sessionTag,k.info("Recovered session tag from mapping",{opencodeSessionId:e.sessionId,sessionTag:t.sessionTag})):(n.createOrUpdateMapping(r,e.sessionId).catch((()=>{})),k.info("Registered session tag mapping",{opencodeSessionId:e.sessionId,sessionTag:r}))}),(e=>k.debug("Mapping lookup failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve(),l=o.lockRequest?o.lockRequest(t,r).then((e=>{i=e.locked,e.locked?k.info("Acquired request lock",{requestId:t,sessionTag:r}):k.warn("Failed to acquire request lock",{requestId:t,sessionTag:r})}),(e=>k.warn("Lock acquisition failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve()
+if(await Promise.all([c,l]),!i&&a&&a!==r&&o.lockRequest)try{(await o.lockRequest(t,a)).locked?k.info("Acquired lock with recovered session tag after MCP restart",{requestId:t,sessionTag:a}):k.warn("Lock still held by a different session after recovered-tag retry",{requestId:t,recoveredTag:a})}catch(e){k.warn("Lock retry with recovered tag failed",{error:(0,d.getErrorMessage)(e)})}}catch(e){k.warn("Error in session tag mapping / lock acquisition",{error:(0,d.getErrorMessage)(e)})}}}}o&&(o.currentSessionId=q||"__unknown__")
 const S=`${Date.now()}-${Math.random().toString(36).slice(2,10)}`,T=e=>{const{getActionServerBaseUrl:r}=t(9414)
 fetch(r()+"/api/mcp/tool-call-event",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({action:e,callId:S}),signal:AbortSignal.timeout(500)}).catch((()=>{}))}
 let P
@@ -4548,10 +4550,13 @@ if(n.workspaceManager){o.debug("Using WorkspaceManager for request context switc
 try{if("multi-agent"===n.workspaceManager.getCurrentContext(n.currentSessionId).mode)if(o.debug("Multi-agent mode: checking request lock before auto-switch",{requestId:r}),n.apiClient)try{const e=n.apiClient.getRequestClient(),{sessionTag:t}=(0,h.getGlobalClientInfo)()
 c=Date.now()
 const s=await e.getRequestLockStatus(r)
-if(Date.now(),s.isLocked&&s.lockedBySessionTag!==t){o.warn("Auto-switch blocked by request lock",{requestId:r,lockedByAgent:s.lockedBySessionTag,currentAgent:t,lockedAt:s.lockedAt})
-let e=`Request ${r} is currently locked by another agent (${s.lockedBySessionTag}).\n\nLocked since: ${s.lockedAt||"unknown"}\n\nIn multi-agent mode, only one agent can work on a request at a time. Please wait for the other agent to complete their work or contact an administrator if the lock appears stale.`
-if(n.lockOverrideManager&&n.configManager)try{const t=await n.configManager.getEffectiveConfig(n.mainBasePath)
-t.lockOverride.enabled&&(e+=`\n\n**To take over this request (only if safe to do so), use switch_to_branch with password: \`${n.lockOverrideManager.generatePassword(r,t.lockOverride.passwordValidityMinutes)}\` (valid for ${t.lockOverride.passwordValidityMinutes} minutes)**`)}catch(e){o.warn("Failed to check lock override config",{error:e})}throw new p.RequestLockError(e,r,s.lockedBySessionTag,s.lockedAt)}if(!s.isLocked){c=Date.now(),o.debug("Acquiring lock for auto-switch",{requestId:r,sessionTag:t})
+Date.now()
+const i=10,l=s.lockedAt?Date.now()-new Date(s.lockedAt).getTime():0,d=l>6e4*i
+if(s.isLocked&&s.lockedBySessionTag!==t&&!d){o.warn("Auto-switch blocked by request lock",{requestId:r,lockedByAgent:s.lockedBySessionTag,currentAgent:t,lockedAt:s.lockedAt,lockAgeMs:l})
+const e=Math.max(0,Math.ceil(i-l/6e4))
+let a=`Request ${r} is currently locked by another agent (${s.lockedBySessionTag}).\n\nLocked since: ${s.lockedAt||"unknown"}\n\nIn multi-agent mode, only one agent can work on a request at a time. If the holder is dead/abandoned, the lock will become takeover-eligible in ~${e} minute${1===e?"":"s"} \u2014 retry your operation then and it will succeed automatically. If the holder is genuinely active, wait for them to finish.`
+if(n.lockOverrideManager&&n.configManager)try{const e=await n.configManager.getEffectiveConfig(n.mainBasePath)
+e.lockOverride.enabled&&(a+=`\n\nIf you cannot wait, switch_to_branch with password: \`${n.lockOverrideManager.generatePassword(r,e.lockOverride.passwordValidityMinutes)}\` (valid for ${e.lockOverride.passwordValidityMinutes} minutes) \u2014 ONLY if you are certain the holder is dead.`)}catch(e){o.warn("Failed to check lock override config",{error:e})}throw new p.RequestLockError(a,r,s.lockedBySessionTag,s.lockedAt)}if(d&&s.lockedBySessionTag!==t&&o.info("Stale lock detected \u2014 DAO will take it over on next acquire",{requestId:r,staleBySessionTag:s.lockedBySessionTag,lockAgeMs:l}),!s.isLocked||d){c=Date.now(),o.debug("Acquiring lock for auto-switch",{requestId:r,sessionTag:t})
 const n=await e.lockRequest(r,t)
 if(Date.now(),!n.locked){const e=`Failed to acquire lock for request ${r} during auto-switch`
 throw o.warn("Auto-switch lock acquisition failed",{requestId:r}),Error(e)}o.info("Successfully acquired lock for auto-switch",{requestId:r,sessionTag:t,lockedAt:n.lockedAt}),a=!0}}catch(e){throw o.error("Lock check/acquisition failed during auto-switch",{requestId:r,error:e instanceof Error?e.message:e+""}),e}else o.warn("Multi-agent mode but no API client available for locking",{requestId:r})

package/dist/mcp-direct.js

@@ -738,8 +738,10 @@ e&&s&&await o.workspaceManager.ensureReadonlyBranchIfNeeded(e,n,s,q)}catch(e){k.
 if(e?.sessionId&&t){const r=t.match(/^requests\/(.+)$/),n="1"===process.env.ALCHEMY_ALLOW_PARALLEL
 if(r&&!n){const t=r[1]
 E=!0
-try{const{sessionTag:r}=(0,g.getGlobalClientInfo)(),n=s.getSessionTagMappingClient(),o=s.getRequestClient(),i=n?n.getMappingByOpencodeSessionId(e.sessionId).then((t=>{t?((0,g.setSessionTag)(t.sessionTag),k.info("Recovered session tag from mapping",{opencodeSessionId:e.sessionId,sessionTag:t.sessionTag})):(n.createOrUpdateMapping(r,e.sessionId).catch((()=>{})),k.info("Registered session tag mapping",{opencodeSessionId:e.sessionId,sessionTag:r}))}),(e=>k.debug("Mapping lookup failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve(),a=o.lockRequest?o.lockRequest(t,r).then((e=>{e.locked?k.info("Acquired request lock",{requestId:t,sessionTag:r}):k.warn("Failed to acquire request lock",{requestId:t,sessionTag:r})}),(e=>k.warn("Lock acquisition failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve()
-await Promise.all([i,a])}catch(e){k.warn("Error in session tag mapping / lock acquisition",{error:(0,d.getErrorMessage)(e)})}}}}o&&(o.currentSessionId=q||"__unknown__")
+try{const{sessionTag:r}=(0,g.getGlobalClientInfo)(),n=s.getSessionTagMappingClient(),o=s.getRequestClient()
+let i=!1,a=null
+const c=n?n.getMappingByOpencodeSessionId(e.sessionId).then((t=>{t?((0,g.setSessionTag)(t.sessionTag),a=t.sessionTag,k.info("Recovered session tag from mapping",{opencodeSessionId:e.sessionId,sessionTag:t.sessionTag})):(n.createOrUpdateMapping(r,e.sessionId).catch((()=>{})),k.info("Registered session tag mapping",{opencodeSessionId:e.sessionId,sessionTag:r}))}),(e=>k.debug("Mapping lookup failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve(),l=o.lockRequest?o.lockRequest(t,r).then((e=>{i=e.locked,e.locked?k.info("Acquired request lock",{requestId:t,sessionTag:r}):k.warn("Failed to acquire request lock",{requestId:t,sessionTag:r})}),(e=>k.warn("Lock acquisition failed",{error:(0,d.getErrorMessage)(e)}))):Promise.resolve()
+if(await Promise.all([c,l]),!i&&a&&a!==r&&o.lockRequest)try{(await o.lockRequest(t,a)).locked?k.info("Acquired lock with recovered session tag after MCP restart",{requestId:t,sessionTag:a}):k.warn("Lock still held by a different session after recovered-tag retry",{requestId:t,recoveredTag:a})}catch(e){k.warn("Lock retry with recovered tag failed",{error:(0,d.getErrorMessage)(e)})}}catch(e){k.warn("Error in session tag mapping / lock acquisition",{error:(0,d.getErrorMessage)(e)})}}}}o&&(o.currentSessionId=q||"__unknown__")
 const S=`${Date.now()}-${Math.random().toString(36).slice(2,10)}`,T=e=>{const{getActionServerBaseUrl:r}=t(9414)
 fetch(r()+"/api/mcp/tool-call-event",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({action:e,callId:S}),signal:AbortSignal.timeout(500)}).catch((()=>{}))}
 let x
@@ -4281,10 +4283,13 @@ if(n.workspaceManager){o.debug("Using WorkspaceManager for request context switc
 try{if("multi-agent"===n.workspaceManager.getCurrentContext(n.currentSessionId).mode)if(o.debug("Multi-agent mode: checking request lock before auto-switch",{requestId:r}),n.apiClient)try{const e=n.apiClient.getRequestClient(),{sessionTag:t}=(0,h.getGlobalClientInfo)()
 c=Date.now()
 const s=await e.getRequestLockStatus(r)
-if(Date.now(),s.isLocked&&s.lockedBySessionTag!==t){o.warn("Auto-switch blocked by request lock",{requestId:r,lockedByAgent:s.lockedBySessionTag,currentAgent:t,lockedAt:s.lockedAt})
-let e=`Request ${r} is currently locked by another agent (${s.lockedBySessionTag}).\n\nLocked since: ${s.lockedAt||"unknown"}\n\nIn multi-agent mode, only one agent can work on a request at a time. Please wait for the other agent to complete their work or contact an administrator if the lock appears stale.`
-if(n.lockOverrideManager&&n.configManager)try{const t=await n.configManager.getEffectiveConfig(n.mainBasePath)
-t.lockOverride.enabled&&(e+=`\n\n**To take over this request (only if safe to do so), use switch_to_branch with password: \`${n.lockOverrideManager.generatePassword(r,t.lockOverride.passwordValidityMinutes)}\` (valid for ${t.lockOverride.passwordValidityMinutes} minutes)**`)}catch(e){o.warn("Failed to check lock override config",{error:e})}throw new p.RequestLockError(e,r,s.lockedBySessionTag,s.lockedAt)}if(!s.isLocked){c=Date.now(),o.debug("Acquiring lock for auto-switch",{requestId:r,sessionTag:t})
+Date.now()
+const i=10,l=s.lockedAt?Date.now()-new Date(s.lockedAt).getTime():0,d=l>6e4*i
+if(s.isLocked&&s.lockedBySessionTag!==t&&!d){o.warn("Auto-switch blocked by request lock",{requestId:r,lockedByAgent:s.lockedBySessionTag,currentAgent:t,lockedAt:s.lockedAt,lockAgeMs:l})
+const e=Math.max(0,Math.ceil(i-l/6e4))
+let a=`Request ${r} is currently locked by another agent (${s.lockedBySessionTag}).\n\nLocked since: ${s.lockedAt||"unknown"}\n\nIn multi-agent mode, only one agent can work on a request at a time. If the holder is dead/abandoned, the lock will become takeover-eligible in ~${e} minute${1===e?"":"s"} \u2014 retry your operation then and it will succeed automatically. If the holder is genuinely active, wait for them to finish.`
+if(n.lockOverrideManager&&n.configManager)try{const e=await n.configManager.getEffectiveConfig(n.mainBasePath)
+e.lockOverride.enabled&&(a+=`\n\nIf you cannot wait, switch_to_branch with password: \`${n.lockOverrideManager.generatePassword(r,e.lockOverride.passwordValidityMinutes)}\` (valid for ${e.lockOverride.passwordValidityMinutes} minutes) \u2014 ONLY if you are certain the holder is dead.`)}catch(e){o.warn("Failed to check lock override config",{error:e})}throw new p.RequestLockError(a,r,s.lockedBySessionTag,s.lockedAt)}if(d&&s.lockedBySessionTag!==t&&o.info("Stale lock detected \u2014 DAO will take it over on next acquire",{requestId:r,staleBySessionTag:s.lockedBySessionTag,lockAgeMs:l}),!s.isLocked||d){c=Date.now(),o.debug("Acquiring lock for auto-switch",{requestId:r,sessionTag:t})
 const n=await e.lockRequest(r,t)
 if(Date.now(),!n.locked){const e=`Failed to acquire lock for request ${r} during auto-switch`
 throw o.warn("Auto-switch lock acquisition failed",{requestId:r}),Error(e)}o.info("Successfully acquired lock for auto-switch",{requestId:r,sessionTag:t,lockedAt:n.lockedAt}),a=!0}}catch(e){throw o.error("Lock check/acquisition failed during auto-switch",{requestId:r,error:e instanceof Error?e.message:e+""}),e}else o.warn("Multi-agent mode but no API client available for locking",{requestId:r})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemylab",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "private": false,
   "description": "AlchemyLab - agentic coding IDEm",
   "author": "Testfire Software",