@jc_stack/ez-agents 0.1.0-beta.37 → 0.1.0-beta.38

package/.env.example

@@ -13,9 +13,9 @@ EZ_AGENT_WORKSPACE=./agent
 # Optional. Default is 300.
 # Agent execution has no wall-clock timeout. Use /stop or schedule cancel.
 
-# CLI Executor adapter. Supported: agy (default), claude, grok, opencode
+# CLI Executor adapter. Supported: codex (default), codex-gui, claude, grok, opencode, pi
 # Switch easily with: pnpm run setup <executor-name>
-EZ_EXECUTOR_CLI=agy
+EZ_EXECUTOR_CLI=codex
 
 # Optional: Audio transcription (STT) and voice synthesis (TTS)
 # GEMINI_API_KEY=

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.0-beta.38
+
+- Remove the retired Antigravity CLI integration and its unused engine paths.
+- Add scoped application delivery history readback so an authorized application
+  can retrieve its own messages and delivery receipts.
+- Validate host execution against its advertised model catalog and keep host
+  heartbeats responsive during background catalog refresh.
+
 ## 0.1.0-beta.37
 
 - List installed OpenCode models with their provider variants as selectable

package/README.md

@@ -291,7 +291,6 @@ Existing conversations without a title show their first saved message and date w
 available. Empty routing placeholders are omitted from history; + New conversation
 is the create action. Back updates the current menu without creating a conversation. Use /rename for a custom name. Older
 records without a saved model reuse a known choice for their original CLI.
-Antigravity's latest-only resume cannot switch back to an older conversation.
 The list covers sessions already tracked by this Ez agent; it does not import
 unrelated GUI/CLI history. Application-backed channels keep session controls in
 the connected application. Shared workspace files still persist across topics.

package/docs/application-channel.md

@@ -131,6 +131,14 @@ not that a human read it. Failure adds a generic `error`; detailed logs remain
 local to core. Cancellation uses the existing child termination boundary and may
 return `running` until the process exits.
 
+Inside an active native application run, `ezenciel-agents-message history
+--limit 8` reads delivered text from this same inbox for the run's immutable
+application binding and scope, including earlier runs in that scope. It cannot
+read another binding, scope, or Telegram chat. The Telegram numeric
+`--message-id` filter is unavailable for application runs. This reads the same
+bounded relay delivery state as the application inbox; both disappear on relay
+restart and add no persistent message record.
+
 `requestId` and `scope` accept 1–200 ASCII letters, digits, `_:.-`. Text is at most
 16,000 characters. Context is an optional JSON object (48 KiB); the complete HTTP
 body is bounded to 64 KiB. Unknown input fields are rejected. Use a stable job ID:
@@ -155,8 +163,7 @@ application must not infer or auto-submit consent.
 
 Each application binding plus scope gets an existing core session. Its first run
 captures the selected engine/preset; later runs resume that same native session.
-Application sessions are excluded from the Telegram session selector. Engines
-that only resume an implicit latest session (`agy`) cannot serve isolated scopes.
+Application sessions are excluded from the Telegram session selector.
 
 Before cutting over an existing application, stop its old runner, copy its native
 transcripts into the ordinary engine's private state, and import each authoritative

package/docs/upgrades.md

@@ -245,7 +245,7 @@ The package-owned locator is the managed `<!-- ez tools -->` block: the bound
 generated on read. Plugin registry init and update binding refresh that locator.
 Malformed markers and symlinks fail visibly rather than overwriting personal work.
 
-Codex, agy, Grok and OpenCode discover workspace instructions natively. Claude
+Codex, Grok and OpenCode discover workspace instructions natively. Claude
 receives the native `--append-system-prompt-file` binding to `AGENTS.md`, alongside
 its own normal instructions. Fresh and resumed owner input is literal; ez does
 not surround it with policies, tool recipes, repair instructions or history.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jc_stack/ez-agents",
-  "version": "0.1.0-beta.37",
+  "version": "0.1.0-beta.38",
   "private": false,
   "type": "module",
   "description": "A lightweight foundation for persistent business AI assistants using existing AI harnesses, workspaces and plugins.",

package/src/ai.ts

@@ -12,7 +12,7 @@ export type AiPreset = { id: string; name: string; cli: string; provider?: strin
 export type ExecutionChoice = { sessionId: string; preset: AiPreset }
 export type ModelChoice = { cli: string; provider?: string; model?: string; name: string; efforts: string[] }
 const safe = (s: unknown): s is string => typeof s === 'string' && /^[a-zA-Z0-9_./:-]{1,160}$/.test(s)
-const knownClis = ['grok', 'codex', 'codex-gui', 'claude', 'opencode', 'agy', 'pi']
+const knownClis = ['grok', 'codex', 'codex-gui', 'claude', 'opencode', 'pi']
 const nativeEffort = (cli: string, effort: string) =>
   cli === 'pi' ? ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'].includes(effort) : true
 export const isPreset = (p: unknown): p is AiPreset => {
@@ -158,8 +158,7 @@ export const readModels = async (home = homedir(), available = installed, codexH
     models.push(...(desktop.length ? desktop : [{ cli: 'codex-gui', name: 'codex-gui · desktop', efforts: [] }]))
   }
   // Other adapters expose the authenticated client's default, not a guessed catalog.
-  for (const cli of ['claude', 'agy'])
-    if (await available(cli)) models.push({ cli, name: `${cli} · client default`, efforts: [] })
+  if (await available('claude')) models.push({ cli: 'claude', name: 'claude · client default', efforts: [] })
   const allow = opencodeAllowlist ?? opencodeProviderAllowlist()
   if (await available('opencode')) models.push(...await opencodeCatalogModels(opencodeRunner, opencodeDataHome, allow))
   // Pi has separate provider configuration. OpenCode's catalog cannot
@@ -213,7 +212,7 @@ export const opencodeProviderAllowlist = (env: NodeJS.ProcessEnv = process.env):
 export const validateSelection = async (p: AiPreset, catalog: ModelChoice[], available = installed): Promise<void> => {
   assertEffort(p.effort, p.model, p.cli)
   if (!isPreset(p) || !(await available(p.cli))) throw new Error('This CLI is not installed.')
-  if (!p.provider && !p.model && !p.effort && p.cli !== 'agy') return
+  if (!p.provider && !p.model && !p.effort) return
   const model = catalog.find((m) => m.cli === p.cli && m.provider === p.provider && m.model === p.model)
   if (!model || (p.effort && !model.efforts.includes(p.effort)))
     throw new Error('This model/effort is not in the installed client catalog. Refresh the client and try again; no fallback was selected.')

package/src/application-channel.ts

@@ -206,7 +206,7 @@ export class ApplicationChannel {
     }
     if (value.action==='model') {
       const model = (await controls.catalog()).find(item=>item.cli===value.cli && item.provider===value.provider && item.model===value.model)
-      if (!model || model.cli==='agy' || (value.effort!==undefined && (typeof value.effort!=='string' || !model.efforts.includes(value.effort)))) throw new Error('Invalid application model selection')
+      if (!model || (value.effort!==undefined && (typeof value.effort!=='string' || !model.efforts.includes(value.effort)))) throw new Error('Invalid application model selection')
       preset = await controls.saveSelection(model,value.effort as string|undefined,guard)
     }
     await control.changeApplicationSession(hashedScope,guard,preset)

package/src/config.ts

@@ -78,7 +78,7 @@ export const loadConfig = (env: NodeJS.ProcessEnv = process.env): Config => {
     isolation,
     codexSandbox: codexSandbox === 'external' ? 'external' : undefined,
     codexAutoCompactTokens: !env.EZ_CODEX_AUTO_COMPACT_TOKENS?.trim() ? undefined : positiveInteger(env.EZ_CODEX_AUTO_COMPACT_TOKENS, 'EZ_CODEX_AUTO_COMPACT_TOKENS'),
-    executorCli: env.EZ_EXECUTOR_CLI?.trim() || 'agy',
+    executorCli: env.EZ_EXECUTOR_CLI?.trim() || 'codex',
     applicationPort: env.EZ_APPLICATION_PORT ? positiveInteger(env.EZ_APPLICATION_PORT, 'EZ_APPLICATION_PORT') : undefined,
     applicationHost: env.EZ_APPLICATION_HOST?.trim() || '127.0.0.1',
     channelBackendUrl: env.EZ_CHANNEL_BACKEND_URL?.trim(),

package/src/control-state.ts

@@ -483,8 +483,6 @@ export class ControlStore {
       if (state.activeSession?.sessionId === sessionId) return state.activeSession
       const session = state.sessions?.find(s => s.sessionId === sessionId)
       if (!session || session.archived || (session.applicationScope && !session.telegramShared)) throw new Error('Conversation unavailable. Open /chats again.')
-      if (session.cli === 'agy')
-        throw new Error('Antigravity only resumes its latest conversation; selecting an older session is not supported.')
       const ai = state.ai
       // Older sessions did not record their model. Reuse a known preset for the
       // same CLI; never resume an engine ID through a different client.
@@ -684,7 +682,6 @@ export class ControlStore {
         return { sessionId: previous.sessionId, preset: previous.preset }
       }
       const preset = requested ?? state.ai.presets.find(item => item.id === state.ai!.selectedId)!
-      if (preset.cli === 'agy') throw new Error('Application scopes require an engine with explicit session selection')
       const session: SessionState = { sessionId: crypto.randomUUID(), hasStarted: false, cli: preset.cli, preset, applicationScope: scope }
       state.sessions.push(session)
       activate(session)
@@ -707,7 +704,7 @@ export class ControlStore {
       if (previous && (previous.telegramShared || previous === state.activeSession))
         throw new Error('Application scope is shared; use shared controls')
       const nextPreset = preset ?? state.ai?.presets.find(item => item.id === state.ai!.defaultId)
-      if (!nextPreset || !isPreset(nextPreset) || nextPreset.cli === 'agy') throw new Error('Invalid application AI selection')
+      if (!nextPreset || !isPreset(nextPreset)) throw new Error('Invalid application AI selection')
       if (preset && previous?.cli === preset.cli) {
         previous.preset = persistedPreset(preset)
         await this.writeState(state)

package/src/executor.ts

@@ -143,17 +143,6 @@ export const EXECUTOR_REGISTRY: Record<string, CliAdapter> = {
       return args
     },
   },
-  agy: {
-    name: 'antigravity',
-    command: 'agy',
-    description: 'Google Antigravity CLI (default)',
-    buildArgs: (opts, _promptFile, promptText) => {
-      const args: string[] = []
-      if (opts.isResume) args.push('-c')
-      args.push('--dangerously-skip-permissions', `--print=${promptText}`)
-      return args
-    },
-  },
   claude: {
     name: 'claude',
     command: 'claude',
@@ -242,13 +231,12 @@ export const EXECUTOR_REGISTRY: Record<string, CliAdapter> = {
 }
 
 export const EXECUTOR_ALIASES: Record<string, string> = {
-  antigravity: 'agy',
   'claude-code': 'claude',
   oc: 'opencode',
 }
 
 export const executorKey = (name?: string): string => {
-  const normalized = (name ?? 'agy').trim().toLowerCase()
+  const normalized = (name ?? 'codex').trim().toLowerCase()
   const resolvedKey = EXECUTOR_ALIASES[normalized] ?? normalized
   if (!EXECUTOR_REGISTRY[resolvedKey]) {
     const supported = [...Object.keys(EXECUTOR_REGISTRY), ...Object.keys(EXECUTOR_ALIASES)].join(', ')
@@ -314,14 +302,6 @@ export const grokInvocation = (
   args: EXECUTOR_REGISTRY.grok.buildArgs(options, promptFile, ''),
 })
 
-export const antigravityInvocation = (
-  prompt: string,
-  options: Pick<ExecutorOptions, 'isResume'> = {},
-): { command: string; args: string[] } => ({
-  command: EXECUTOR_REGISTRY.agy.command,
-  args: EXECUTOR_REGISTRY.agy.buildArgs({ workspace: '', ...options }, '', prompt),
-})
-
 export const opencodeInvocation = (
   prompt: string,
   options: Pick<ExecutorOptions, 'workspace' | 'sessionId' | 'isResume'> = { workspace: '' },

package/src/host-executor.ts

@@ -9,7 +9,7 @@ import { isHostRunId } from './host-executor-protocol.js'
 import { fileURLToPath } from 'node:url'
 import { startExecutorJob, terminateJob, resolveExecutor, validateCodexProvider, type CodexProviderBinding, type ExecutorOptions } from './executor.js'
 import { parseIsolationClass, type IsolationClass } from './isolation.js'
-import { readModels, validateSelection, validateOpencodeProviders } from './ai.js'
+import { readModels, validateSelection, validateOpencodeProviders, type ModelChoice } from './ai.js'
 import type { ChildProcess } from 'node:child_process'
 import { taskWorkspace } from './task-workspace.js'
 import { packageVersion } from './version.js'
@@ -20,9 +20,27 @@ export type PluginNetworkRoute = { revisions:string[]; bindings:{service:string;
 export type HostBinding = { name: string; workspace: string; controlDir: string; binDir: string; toolsHome?: string; sharedWorkspace?: string; additionalWorkspaces?: string[]; pluginNetworkBindings?: Record<string, PluginNetworkRoute>; pluginFolderRoots?: Record<string,string[]>; codexProviders?: CodexProviderBinding[]; opencodeProviders?: string[] }
 export type HostInstallation = { cli: string; isolation?: IsolationClass; agents: HostBinding[] }
 
+// Periodic refresh body, extracted for testing. Throws on failure; the
+// caller keeps the last-good disk catalog and the host alive.
+export const refreshAgentCatalog = async (agent: HostBinding,
+  readFresh: (agent: HostBinding) => Promise<ModelChoice[]>,
+  seen: Map<HostBinding, string>): Promise<void> => {
+  const catalogModels = await readFresh(agent)
+  // Empty discovery is not an authoritative deletion of the installed catalog.
+  if (!catalogModels.length) return
+  const models = JSON.stringify(catalogModels)
+  if (seen.get(agent) === models) return
+  await new ControlStore(agent.controlDir, 900000).normalizeProviderBindings(catalogModels)
+  const file = path.join(agent.controlDir, 'host-executor/models.json')
+  await writeFile(file + '.tmp', models, { mode: 0o600 })
+  await rename(file + '.tmp', file)
+  seen.set(agent, models)
+}
+
 const processStart = async (pid:number) => (await processSnapshot()).get(pid)?.birth
 
-export const serveHostExecutor = async (installation: HostInstallation, signal: AbortSignal, launch = startExecutorJob) => {
+export const serveHostExecutor = async (installation: HostInstallation, signal: AbortSignal, launch = startExecutorJob,
+  readCatalog?: (agent: HostBinding) => Promise<ModelChoice[]>) => {
   if (installation.isolation !== undefined) parseIsolationClass(installation.isolation)
   if (installation.isolation === 'isolated') throw new Error('Isolated agents run the native CLI in the relay; do not start host transport')
   resolveExecutor(installation.cli)
@@ -31,6 +49,7 @@ export const serveHostExecutor = async (installation: HostInstallation, signal:
     throw new Error('Each agent requires a separate workspace and control directory')
   const active = new Map<string, ChildProcess>()
   const tasks = new Set<Promise<void>>()
+  let catalogRefresh: Promise<void> | undefined
   const locks: string[] = []
   const sharedWorkspaces = new Map<HostBinding, string>()
   const additionalWorkspaces = new Map<HostBinding, string[]>()
@@ -47,6 +66,12 @@ export const serveHostExecutor = async (installation: HostInstallation, signal:
       model.model !== undefined && declaredModels.has(model.model) && model.cli === 'codex'
     return [...discovered.filter(model => !isReplacedByProvider(model)), ...declared]
   }
+  const freshCatalog = readCatalog ?? catalog
+  const beat = async (agent: HostBinding) => {
+    const directory = path.join(agent.controlDir, 'host-executor')
+    await writeFile(path.join(directory, 'heartbeat.tmp'), JSON.stringify({ at: Date.now(), pid: process.pid, version: packageVersion, platform: process.platform, arch: process.arch, plugins: await installedPluginVersions(agent.toolsHome) }), { mode: 0o600 })
+    await rename(path.join(directory, 'heartbeat.tmp'), path.join(directory, 'heartbeat.json'))
+  }
   try {
     for (const agent of installation.agents) {
       if (![agent.workspace,agent.controlDir,agent.binDir].every(path.isAbsolute)) throw new Error('Host bindings require absolute paths')
@@ -79,7 +104,7 @@ export const serveHostExecutor = async (installation: HostInstallation, signal:
       catch(error) { if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error }
       await writeFile(lock,JSON.stringify({pid:process.pid,started:await processStart(process.pid)}),{mode:0o600,flag:'wx'})
       locks.push(lock)
-      const models = await catalog(agent)
+      const models = await freshCatalog(agent)
       await new ControlStore(agent.controlDir, 900000).normalizeProviderBindings(models)
       const modelsFile=path.join(directory,'models.json')
       await writeFile(modelsFile+'.tmp',JSON.stringify(models),{mode:0o600});await rename(modelsFile+'.tmp',modelsFile)
@@ -102,22 +127,23 @@ export const serveHostExecutor = async (installation: HostInstallation, signal:
     while (!signal.aborted) {
       const parent=Number(process.env.EZ_HOST_SUPERVISOR_PID)
       if(parent) { try { process.kill(parent,0) } catch { break } }
-      if(Date.now()-catalogAt>30000){
-        for(const agent of installation.agents){
-          const catalogModels = await catalog(agent)
-          const models=JSON.stringify(catalogModels)
-          if(catalogSeen.get(agent)===models)continue
-          await new ControlStore(agent.controlDir, 900000).normalizeProviderBindings(catalogModels)
-          const file=path.join(agent.controlDir,'host-executor/models.json')
-          await writeFile(file+'.tmp',models,{mode:0o600});await rename(file+'.tmp',file)
-          catalogSeen.set(agent,models)
-        }
+      // Keep transport liveness independent of native catalog I/O.
+      for (const agent of installation.agents) await beat(agent)
+      if(!catalogRefresh && Date.now()-catalogAt>30000){
         catalogAt=Date.now()
+        catalogRefresh=(async()=>{
+          for(const agent of installation.agents){
+            if(signal.aborted)break
+            try {
+              await refreshAgentCatalog(agent, freshCatalog, catalogSeen)
+            } catch (error) {
+              console.error('Host catalog refresh failed, keeping last-good models', error instanceof Error ? error.message : error)
+            }
+          }
+        })().finally(()=>{catalogRefresh=undefined})
       }
       for (const agent of installation.agents) {
         const directory=path.join(agent.controlDir,'host-executor')
-        await writeFile(path.join(directory,'heartbeat.tmp'),JSON.stringify({at:Date.now(),pid:process.pid,version:packageVersion,platform:process.platform,arch:process.arch,plugins:await installedPluginVersions(agent.toolsHome)}),{mode:0o600})
-        await rename(path.join(directory,'heartbeat.tmp'),path.join(directory,'heartbeat.json'))
         for (const file of await readdir(directory)) {
           if (!file.endsWith('.request.json') || !isHostRunId(file.slice(0,-13))) continue
           const id=file.slice(0,-13)
@@ -163,7 +189,10 @@ export const serveHostExecutor = async (installation: HostInstallation, signal:
               if (provider && model && !provider.models.includes(model)) throw new Error('Selected model is not declared for this Codex provider')
               if (!provider && model && (agent.codexProviders ?? []).some(binding=>binding.models.includes(model)))
                 throw new Error('Selected Codex provider is required for this model')
-              if (cli !== installation.cli) await validateSelection({id:'selected',name:'Selected model',cli,provider:opts.provider,model,effort:opts.effort},await catalog(agent))
+              // Admission and execution must use the same catalog snapshot. A
+              // transient native-client probe failure must not reject a model
+              // that the host just advertised to the relay and application.
+              if (cli !== installation.cli) await validateSelection({id:'selected',name:'Selected model',cli,provider:opts.provider,model,effort:opts.effort},JSON.parse(await readFile(path.join(directory,'models.json'),'utf8')))
               const options:ExecutorOptions={workspace:run?.scheduled ? await taskWorkspace(agent.controlDir,id) : agent.workspace,controlDir:agent.controlDir,binDir:agent.binDir,toolsHome:agent.toolsHome,sharedWorkspace,additionalWorkspaces:additionalWorkspaces.get(agent),cli,
                 runId:path.basename(base),timeoutMs:0,repairEnabled:opts.repairEnabled,
                 sessionId:opts.sessionId,isResume:opts.isResume,model,effort:opts.effort,provider:opts.provider,codexAutoCompactTokens:opts.codexAutoCompactTokens,codexProvider:provider,
@@ -200,6 +229,7 @@ export const serveHostExecutor = async (installation: HostInstallation, signal:
   } finally {
     for(const child of active.values())terminateJob(child)
     await Promise.allSettled(tasks)
+    await catalogRefresh
     for(const lock of locks)await rm(lock,{force:true})
   }
 }

package/src/message-history.ts

@@ -13,7 +13,25 @@ export async function deliveredMessages(controlDir: string, runId: string, optio
   if (options.messageId !== undefined && (!Number.isSafeInteger(options.messageId) || options.messageId < 1))
     throw new Error('Message ID must be a positive integer')
   const caller = await requireOwnerExecution(controlDir, runId)
-  if (caller.application || caller.delivery) throw new Error('History requires a Telegram owner run')
+  const application = caller.application ?? caller.delivery
+  if (application) {
+    if (options.messageId !== undefined) throw new Error('Message ID filter is only available for Telegram history')
+    const owner = (await new ControlStore(controlDir, 900_000).status()).owner
+    const runs = new Map((await new RunStore(controlDir).list()).filter(run => {
+      const origin = run.application ?? run.delivery
+      return origin?.bindingId === application.bindingId && origin.scope === application.scope &&
+        !run.external && !run.taskId && ownsRun(owner, run)
+    }).map(run => [run.id, run]))
+    const messages = sentOutbox(controlDir).flatMap(item => {
+      const run = item.runId === undefined ? undefined : runs.get(item.runId)
+      return run && (!item.type || item.type === 'message') && typeof item.text === 'string'
+        ? [{ runId: run.id, id: item.id, text: item.text, createdAt: item.createdAt }]
+        : []
+    })
+    messages.sort((a, b) => a.createdAt.localeCompare(b.createdAt) || a.id.localeCompare(b.id))
+    return { scope: application.scope, messages: messages.slice(-limit), hasMore: messages.length > limit,
+      note: 'Delivered messages in the current application binding and scope; relay history is bounded and resets on restart.' }
+  }
   const owner = (await new ControlStore(controlDir, 900_000).status()).owner
   if (!ownsRun(owner, caller)) throw new Error('Owner binding changed')
   const pairedAt = Date.parse(owner!.pairedAt)

package/src/message.ts

@@ -13,8 +13,8 @@ if (rawArgs.includes('--help') || rawArgs.includes('-h')) {
   console.log(
     'Usage: ezenciel-agents-message [--text-file <path> | --text <text>] [--document <path>] [--voice <text>] [--reply-to <id>]',
   )
-  console.log('History: ezenciel-agents-message history [--limit 1..50] [--message-id ID] (read-only, bound Telegram chat, across sessions)')
-  console.log("Authenticated channel: sends go directly to the paired owner's Telegram chat. receipt OUTBOX_ID reads delivery status; sends return queued ID then Telegram delivery receipt or unknown outcome. Never resend an uncertain operation.")
+  console.log('History: ezenciel-agents-message history [--limit 1..50] [--message-id ID] (read-only; current application binding and scope, or bound Telegram chat). --message-id is Telegram-only.')
+  console.log('Authenticated run: sends use its bound channel (application inbox or paired Telegram chat). Delivery receipts confirm that destination; uncertain sends must not be retried without readback.')
   console.log('Text: --text decodes \\n as a newline and \\\\ as a literal backslash; --text-file preserves file content.')
   process.exit(0)
 }

package/src/setup.ts

@@ -37,7 +37,7 @@ export const readActiveExecutor = async (envFilePath: string): Promise<string> =
   } catch {
     // env file doesn't exist yet
   }
-  return process.env.EZ_EXECUTOR_CLI?.trim() || 'agy'
+  return process.env.EZ_EXECUTOR_CLI?.trim() || 'codex'
 }
 
 export const setExecutorInEnv = async (envFilePath: string, cliName: string): Promise<void> => {
@@ -102,7 +102,7 @@ const printStatus = (status: { active: string; items: ExecutorStatus[] }): void
   console.log('\nTo switch executor:')
   console.log('  pnpm run setup <executor-name>')
   console.log('  Examples: pnpm run setup claude')
-  console.log('            pnpm run setup agy')
+  console.log('            pnpm run setup codex')
   console.log('            pnpm run setup grok')
   console.log('            pnpm run setup opencode')
   console.log('            pnpm run setup pi')

package/test/ai.test.ts

@@ -468,7 +468,8 @@ test('pi does not borrow an unrelated OpenCode catalog', async () => {
   const catalog = await readModels(undefined, async (cli) => cli === 'pi', undefined as never, runner)
   assert.deepEqual(catalog, [{ cli: 'pi', name: 'Pi · client default', efforts: [] }])
   assert.equal(isPreset({ id: 'x', name: 'Pi', cli: 'pi' }), true)
-  assert.equal(isPreset({ id: 'x', name: 'Unavailable', cli: 'unreal-agent' }), false)
+  for (const cli of ['unreal-agent', 'antigravity', 'agy'])
+    assert.equal(isPreset({ id: 'x', name: 'Unavailable', cli }), false)
   await validateSelection({ id: 'choice', name: 'Default', cli: 'pi' }, catalog, async (cli) => cli === 'pi')
   await assert.rejects(
     validateSelection(

package/test/config.test.ts

@@ -23,9 +23,9 @@ test('rejects malformed timeouts', () => {
   assert.throws(() => loadConfig({ TELEGRAM_BOT_TOKEN: '110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsY', EZ_PAIRING_TTL_SECONDS: 'bad' }), /positive integer/)
 })
 
-test('loads executor CLI configuration with agy fallback', () => {
+test('loads executor CLI configuration with codex fallback', () => {
   const defaultConfig = loadConfig({ TELEGRAM_BOT_TOKEN: '110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsY' })
-  assert.equal(defaultConfig.executorCli, 'agy')
+  assert.equal(defaultConfig.executorCli, 'codex')
 
   const customConfig = loadConfig({ TELEGRAM_BOT_TOKEN: '110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsY', EZ_EXECUTOR_CLI: 'claude' })
   assert.equal(customConfig.executorCli, 'claude')

package/test/conversations.test.ts

@@ -66,7 +66,7 @@ test('titles are bounded and rename is durable; malformed IDs and unsupported me
   await assert.rejects(store.listSessions(), /unsupported shape/)
 }))
 
-test('legacy sessions retain IDs; unbound and latest-only engines cannot resume a different context', async () => fixture(async (store, dir) => {
+test('legacy sessions retain IDs; unbound sessions cannot resume a different context', async () => fixture(async (store, dir) => {
   const legacy = await store.ensureActiveSession()
   await store.markSessionStarted(legacy.sessionId)
   await store.captureChoice(initialPreset('grok'))
@@ -74,11 +74,5 @@ test('legacy sessions retain IDs; unbound and latest-only engines cannot resume
   await assert.rejects(store.switchSession(legacy.sessionId), /binding/)
   assert.match(sessionTitle((await store.listSessions()).find(s => s.sessionId === legacy.sessionId)!), /Conversation /)
   await store.archiveSession(legacy.sessionId, true)
-  const agy = { id: 'agy-test', name: 'AGY', cli: 'agy' }
-  await store.savePreset(agy)
-  await store.selectPreset(agy.id, (await store.getActiveSession())!.sessionId, true)
-  const old = await store.captureChoice(agy)
-  await store.markSessionStarted(old.sessionId)
-  await store.resetSession()
-  await assert.rejects(store.switchSession(old.sessionId), /latest conversation/)
+
 }))

package/test/engine-handoff.test.ts

@@ -31,13 +31,13 @@ if(args[0]==='app-server'){
  }
  if(q.method==='thread/goal/get')send({id:q.id,result:{goal:null}});
  });
-}else capture(args.includes('--prompt-file')?fs.readFileSync(args[args.indexOf('--prompt-file')+1],'utf8'):args.some(a=>a.startsWith('--print='))?args.find(a=>a.startsWith('--print=')).slice(8):args.includes('--print')||(args[0]==='exec'&&args.at(-1)==='-')?fs.readFileSync(0,'utf8'):args.at(-1));
+}else capture(args.includes('--prompt-file')?fs.readFileSync(args[args.indexOf('--prompt-file')+1],'utf8'):args.includes('--print')||(args[0]==='exec'&&args.at(-1)==='-')?fs.readFileSync(0,'utf8'):args.at(-1));
 `
- for(const name of ['codex','grok','agy','claude','opencode'])await writeFile(path.join(bin,name),fixture,{mode:0o700})
+ for(const name of ['codex','grok','claude','opencode'])await writeFile(path.join(bin,name),fixture,{mode:0o700})
  const previous={PATH:process.env.PATH,TELEGRAM_BOT_TOKEN:process.env.TELEGRAM_BOT_TOKEN,EZ_EXECUTOR_TRANSPORT:process.env.EZ_EXECUTOR_TRANSPORT}
  process.env.PATH=bin+path.delimiter+process.env.PATH;process.env.TELEGRAM_BOT_TOKEN='do-not-inherit';delete process.env.EZ_EXECUTOR_TRANSPORT
  try {
-  for(const cli of ['codex','grok','agy','claude','opencode'])for(const isResume of [false,true])for(const text of ['  /goal audit list of files and give me a simple list with filenames\n','--help','-','resume']) {
+  for(const cli of ['codex','grok','claude','opencode'])for(const isResume of [false,true])for(const text of ['  /goal audit list of files and give me a simple list with filenames\n','--help','-','resume']) {
    const runId='r_'+cli+'_'+String(isResume)+'_'+Buffer.from(text).toString('hex').slice(0,20)
    await ownerRun(controlDir,runId)
    const job=await startExecutorJob([text],{workspace,controlDir,binDir:bin,cli,runId,timeoutMs:5000,isResume,sessionId:'native-existing',repairEnabled:false})
@@ -51,7 +51,6 @@ if(args[0]==='app-server'){
    }
    if(['codex','claude'].includes(cli))assert.ok(!captured.args.includes('--help'))
    if(cli==='opencode')assert.equal(captured.args.at(-2),'--')
-   if(cli==='agy')assert.ok(captured.args.includes('--print='+text))
    if(cli==='claude')assert.ok(!captured.args.includes('--append-system-prompt-file'))
   }
   for(const [runId,texts] of [['r_schedule_literal',['/goal audit list of files and give me a simple list with filenames']],['r_batch',['first\nline','  second  ']]] as const) {

package/test/executor.test.ts

@@ -6,7 +6,7 @@ import { mkdtemp, mkdir, rm, writeFile, readFile } from 'node:fs/promises'
 import { spawn } from 'node:child_process'
 import { tmpdir } from 'node:os'
 import path from 'node:path'
-import { EXECUTOR_REGISTRY, antigravityInvocation, executorEnvironment, grokInvocation, grokJobEnv, opencodeDataHome, opencodeInvocation, piAgentDir, resolveExecutor, resolveHostCommand, startExecutorJob, terminateJob, validateCodexProvider } from '../src/executor.js'
+import { EXECUTOR_REGISTRY, executorEnvironment, grokInvocation, grokJobEnv, opencodeDataHome, opencodeInvocation, piAgentDir, resolveExecutor, resolveHostCommand, startExecutorJob, terminateJob, validateCodexProvider } from '../src/executor.js'
 import { requireOwnerExecution } from '../src/execution-authority.js'
 import { splitTelegramText } from '../src/reply.js'
 import { matchingProcessIds, processSnapshot } from '../src/process-tree.js'
@@ -97,14 +97,6 @@ test('the Grok invocation is headless, workspace-scoped, and token-free', () =>
   assert.equal(invocation.args.includes('TELEGRAM_BOT_TOKEN'), false)
 })
 
-test('the antigravity invocation is headless, skips permissions, and uses print mode', () => {
-  const invocation = antigravityInvocation('test prompt')
-  assert.equal(invocation.command, 'agy')
-  assert.deepEqual(invocation.args, [
-    '--dangerously-skip-permissions', '--print=test prompt',
-  ])
-})
-
 test('the opencode invocation is headless, auto-approves, and sets model and workspace', () => {
   const invocation = opencodeInvocation('test prompt', { workspace: '/tmp/test-ws' })
   assert.equal(invocation.command, 'opencode')
@@ -119,16 +111,15 @@ test('the opencode invocation is headless, auto-approves, and sets model and wor
 })
 
 test('resolveExecutor correctly maps keys and aliases', () => {
-  assert.equal(resolveExecutor('agy').command, 'agy')
-  assert.equal(resolveExecutor('antigravity').command, 'agy')
   assert.equal(resolveExecutor('claude').command, 'claude')
   assert.equal(resolveExecutor('grok').command, 'grok')
   assert.equal(resolveExecutor('opencode').command, 'opencode')
   assert.equal(resolveExecutor('oc').command, 'opencode')
-  assert.throws(() => resolveExecutor('unreal-agent'), /Unsupported executor CLI/)
+  for (const cli of ['unreal-agent', 'antigravity', 'agy'])
+    assert.throws(() => resolveExecutor(cli), /Unsupported executor CLI/)
   assert.equal(resolveExecutor('codex-gui').name, 'codex-gui')
   assert.notEqual(resolveExecutor('codex-gui').name, resolveExecutor('codex').name)
-  assert.equal(resolveExecutor(undefined).command, 'agy')
+  assert.equal(resolveExecutor(undefined).command, 'codex')
   assert.throws(() => resolveExecutor('claude-spark'), /Unsupported executor CLI "claude-spark"/)
   assert.throws(() => resolveExecutor('spark'), /Unsupported executor CLI "spark"/)
   assert.throws(() => resolveExecutor('nonexistent'), /Unsupported executor CLI "nonexistent"/)

package/test/host-executor.test.ts

@@ -4,7 +4,7 @@ import test from 'node:test'
 import { mkdtemp, mkdir, readFile, writeFile, rm, realpath, symlink } from 'node:fs/promises'
 import path from 'node:path'
 import { tmpdir } from 'node:os'
-import { serveHostExecutor } from '../src/host-executor.js'
+import { serveHostExecutor, refreshAgentCatalog } from '../src/host-executor.js'
 import { spawn } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import { isHostRunId } from '../src/host-executor-protocol.js'
@@ -21,7 +21,7 @@ test('host restart replaces a lock whose PID was reused by another process',asyn
   try {
     await mkdir(workspace);await mkdir(directory,{recursive:true})
     await writeFile(path.join(directory,'worker.lock'),JSON.stringify({pid:process.pid,started:'reused-pid'}))
-    server=serveHostExecutor({cli:'grok',agents:[{name:'test',workspace,controlDir,binDir:root}]},abort.signal)
+    server=serveHostExecutor({cli:'grok',agents:[{name:'test',workspace,controlDir,binDir:root}]},abort.signal,undefined,async()=>[])
     for(let n=0;n<300;n++){try{await readFile(path.join(directory,'heartbeat.json'));break}catch{await new Promise(r=>setTimeout(r,20))}}
     await readFile(path.join(directory,'heartbeat.json'))
     const lock=JSON.parse(await readFile(path.join(directory,'worker.lock'),'utf8'))
@@ -72,7 +72,7 @@ test('host restart clears dead native lease only after proving previous CLI stop
     await assert.rejects(serveHostExecutor(installation,abort.signal),/Previous host CLI is still running/);
     await readFile(path.join(toolsHome,'workspace-writer.lock'));
     await writeFile(path.join(directory,'r_old.process.json'),JSON.stringify({pid:deadPid}));
-    server=serveHostExecutor(installation,abort.signal);
+    server=serveHostExecutor(installation,abort.signal,undefined,async()=>[]);
     for(let n=0;n<300;n++){try{await readFile(path.join(directory,'heartbeat.json'));break}catch{await new Promise(r=>setTimeout(r,20))}}
     await readFile(path.join(directory,'heartbeat.json'));
     await assert.rejects(readFile(path.join(toolsHome,'workspace-writer.lock')),{code:'ENOENT'});
@@ -103,6 +103,7 @@ test('host execution resolves a declared provider from the bound agent, not a la
     await mkdir(fakeBin, {recursive: true})
     await mkdir(path.join(controlDir, 'cli', 'codex'), {recursive: true})
     await writeFile(path.join(fakeBin, 'codex'), '#!/bin/sh\nexit 0\n', {mode: 0o700})
+    await writeFile(path.join(fakeBin, 'opencode'), '#!/bin/sh\nexit 0\n', {mode: 0o700})
     await writeFile(path.join(controlDir, 'cli', 'codex', 'models_cache.json'), JSON.stringify({models: [
       {slug: provider.models[0], visibility: 'list', display_name: 'DeepSeek V4.1 Flash', supported_reasoning_levels: [{effort: 'max'}]},
     ]}))
@@ -117,6 +118,9 @@ test('host execution resolves a declared provider from the bound agent, not a la
       try { await readFile(path.join(directory, 'heartbeat.json')); break }
       catch { await new Promise(resolve => setTimeout(resolve, 20)) }
     }
+    // The selected model was advertised at startup. A later catalog probe
+    // can fail while the client remains able to execute the selected model.
+    await rm(path.join(controlDir, 'cli', 'codex', 'models_cache.json'))
     await writeFile(path.join(directory, 'r_provider.request.json'), JSON.stringify({
       texts: ['hello'], options: {cli: 'codex', provider: 'openrouter', model: provider.models[0], effort: 'max'},
     }))
@@ -166,6 +170,7 @@ test('one installed CLI executes two agent bindings with separate minds and sani
     await writeFile(binary,`#!${process.execPath}\nif(process.env.EZ_RUN_ID==='r_hold')setInterval(()=>{},1000);console.log(JSON.stringify({cwd:process.cwd(),home:process.env.HOME,token:process.env.TELEGRAM_BOT_TOKEN,control:process.env.EZ_CONTROL_DIR,run:process.env.EZ_RUN_ID,repair:process.env.EZ_REPAIR_ENABLED,args:process.argv.slice(2)}));\n`,{mode:0o700})
     await writeFile(path.join(root,'claude'),await readFile(binary),{mode:0o700})
     await writeFile(path.join(root,'codex'),await readFile(binary),{mode:0o700})
+    await writeFile(path.join(root,'opencode'),'#!/bin/sh\nexit 0\n',{mode:0o700})
     process.env.PATH=root+path.delimiter+oldPath
     EXECUTOR_REGISTRY.grok.command=binary
     EXECUTOR_REGISTRY.grok.buildArgs=(opts,file,prompt)=>[...EXECUTOR_REGISTRY.codex.buildArgs(opts,file,prompt).slice(0,-1),prompt]
@@ -241,10 +246,14 @@ test('one installed CLI executes two agent bindings with separate minds and sani
     switched.stdin.end(JSON.stringify({texts:['Explicit CLI change'],options:executionDefaults('claude',{cli:'claude',timeoutMs:5000,effort:undefined})}))
     assert.equal(await new Promise(resolve=>switched.once('close',resolve)),0)
     assert.ok(JSON.parse(switchedOutput).args.includes('--print'))
-    // The bound cache may advertise a model absent from the host's cache.
+    // The host's published catalog can gain a model after its first probe.
     const codexHome=path.join(agents[0].controlDir,'cli','codex')
     await mkdir(codexHome,{recursive:true})
     await writeFile(path.join(codexHome,'models_cache.json'),JSON.stringify({models:[{slug:'agent-only-fixture',visibility:'list',display_name:'Agent model',supported_reasoning_levels:[]}]}))
+    const catalogFile=path.join(agents[0].controlDir,'host-executor','models.json')
+    const advertised=JSON.parse(await readFile(catalogFile,'utf8'))
+    advertised.push({cli:'codex',model:'agent-only-fixture',name:'Agent model',efforts:[]})
+    await writeFile(catalogFile,JSON.stringify(advertised))
     await ownerRun(agents[0].controlDir,'tg_6293307')
     const bound=spawn(process.execPath,['--import',fileURLToPath(new URL('../node_modules/tsx/dist/loader.mjs',import.meta.url)),fileURLToPath(new URL('../src/host-executor-client.ts',import.meta.url)),agents[0].controlDir,'tg_6293307'],{stdio:['pipe','pipe','pipe']})
     let boundOutput='',boundError=''
@@ -354,9 +363,146 @@ test('client cancels on stale or invalid heartbeat instead of waiting indefinite
 
 
 test('host rejects a plugin registry bound to another workspace',async()=>{
- const root=await mkdtemp(path.join(tmpdir(),'ez-host-plugin-binding-'))
- try {
-  await writeFile(path.join(root,'config.json'),JSON.stringify({schemaVersion:1,workspace:'/another-agent'}))
-  await assert.rejects(serveHostExecutor({cli:'codex',agents:[{name:'test',workspace:root,controlDir:root,binDir:root,toolsHome:root}]},new AbortController().signal),/another workspace/)
- } finally {await rm(root,{recursive:true,force:true})}
+  const root=await mkdtemp(path.join(tmpdir(),'ez-host-plugin-binding-'))
+  try {
+   await writeFile(path.join(root,'config.json'),JSON.stringify({schemaVersion:1,workspace:'/another-agent'}))
+   await assert.rejects(serveHostExecutor({cli:'codex',agents:[{name:'test',workspace:root,controlDir:root,binDir:root,toolsHome:root}]},new AbortController().signal),/another workspace/)
+  } finally {await rm(root,{recursive:true,force:true})}
+})
+
+test('refresh blip throws so the caller keeps last-good models instead of crashing',async()=>{
+  const root=await mkdtemp(path.join(tmpdir(),'ez-host-refresh-blip-'))
+  const workspace=path.join(root,'mind'),controlDir=path.join(root,'control'),directory=path.join(controlDir,'host-executor')
+  try {
+    await mkdir(workspace,{recursive:true});await mkdir(directory,{recursive:true})
+    const agent={name:'test',workspace,controlDir,binDir:root}
+    const lastGood=[{cli:'codex',model:'cached-model',name:'Cached',efforts:[]}]
+    await writeFile(path.join(directory,'models.json'),JSON.stringify(lastGood))
+    const seen=new Map()
+    await assert.rejects(refreshAgentCatalog(agent,async()=>{throw new Error('transient catalog blip')},seen),/transient catalog blip/)
+    assert.deepEqual(JSON.parse(await readFile(path.join(directory,'models.json'),'utf8')),lastGood)
+    assert.equal(seen.has(agent),false)
+  } finally {await rm(root,{recursive:true,force:true})}
+})
+
+test('empty refresh preserves the last-good catalog and a later nonempty refresh replaces it',async()=>{
+  const root=await mkdtemp(path.join(tmpdir(),'ez-host-empty-refresh-'))
+  const directory=path.join(root,'host-executor')
+  try {
+    await mkdir(directory)
+    const agent={name:'test',workspace:root,controlDir:root,binDir:root}
+    const lastGood=[{cli:'codex',model:'cached-model',name:'Cached',efforts:[]}]
+    const fresh=[{cli:'codex',model:'new-model',name:'New',efforts:[]}]
+    await writeFile(path.join(directory,'models.json'),JSON.stringify(lastGood))
+    const seen=new Map([[agent,JSON.stringify(lastGood)]])
+    await refreshAgentCatalog(agent,async()=>[],seen)
+    assert.deepEqual(JSON.parse(await readFile(path.join(directory,'models.json'),'utf8')),lastGood)
+    assert.equal(seen.get(agent),JSON.stringify(lastGood))
+    await refreshAgentCatalog(agent,async()=>fresh,seen)
+    assert.deepEqual(JSON.parse(await readFile(path.join(directory,'models.json'),'utf8')),fresh)
+    assert.equal(seen.get(agent),JSON.stringify(fresh))
+  } finally {await rm(root,{recursive:true,force:true})}
+})
+
+test('slow catalog refresh keeps heartbeats live and active client completes without cancellation', {timeout:70000}, async()=>{
+  const root=await mkdtemp(path.join(tmpdir(),'ez-host-slow-refresh-'))
+  const directory=path.join(root,'host-executor')
+  const abort=new AbortController()
+  let server:Promise<void>|undefined
+  let client:ReturnType<typeof spawn>|undefined
+  let closed:Promise<number|null>|undefined
+  let releaseRefresh!:()=>void
+  let startedRefresh!:()=>void
+  const blocked=new Promise<void>(resolve=>{releaseRefresh=resolve})
+  const refreshing=new Promise<void>(resolve=>{startedRefresh=resolve})
+  let calls=0
+  let finishRun: (()=>void) | undefined
+  try {
+    await mkdir(directory)
+    await ownerRun(root,'r_slow_catalog')
+    server=serveHostExecutor({cli:'grok',agents:[{name:'test',workspace:root,controlDir:root,binDir:root}]},abort.signal,async()=>{
+      const child=spawn(process.execPath,['-e','process.stdin.resume();process.stdin.once("data",()=>process.exit(0))'])
+      finishRun=()=>{child.stdin!.end('done')}
+      return {child,cleanup:async()=>{},stdout:''}
+    },async()=>{
+      if(++calls>1){startedRefresh();await blocked}
+      return [{cli:'grok',name:'Grok',efforts:[]}]
+    })
+    for(let n=0;n<300;n++){try{await readFile(path.join(directory,'heartbeat.json'));break}catch{await new Promise(r=>setTimeout(r,20))}}
+    client=spawn(process.execPath,['--import',fileURLToPath(new URL('../node_modules/tsx/dist/loader.mjs',import.meta.url)),fileURLToPath(new URL('../src/host-executor-client.ts',import.meta.url)),root,'r_slow_catalog'],{stdio:['pipe','pipe','pipe']})
+    closed=new Promise(resolve=>client!.once('close',resolve))
+    let stderr='';client.stderr!.on('data',chunk=>stderr+=chunk);client.stdout!.resume()
+    client.stdin!.end(JSON.stringify({texts:['test'],options:{cli:'grok'}}))
+    await refreshing
+    // Exceed the real relay client's 15s offline threshold while discovery hangs.
+    await new Promise(resolve=>setTimeout(resolve,16500))
+    const heartbeat=JSON.parse(await readFile(path.join(directory,'heartbeat.json'),'utf8'))
+    assert.ok(Date.now()-heartbeat.at<5000,'heartbeat stopped during catalog I/O')
+    assert.equal(client.exitCode,null,stderr)
+    await assert.rejects(readFile(path.join(directory,'r_slow_catalog.cancel')),{code:'ENOENT'})
+    assert.equal(calls,2,'catalog refresh must not overlap itself')
+    assert.ok(finishRun,'the native run must have started')
+    finishRun()
+    assert.equal(await closed,0,stderr)
+    releaseRefresh()
+  } finally {
+    releaseRefresh();abort.abort()
+    if(client?.exitCode===null && client.signalCode===null)client.kill()
+    await closed;await server;await rm(root,{recursive:true,force:true})
+  }
+})
+
+test('cross-CLI admission uses the advertised catalog without another discovery probe',async()=>{
+  const root=await mkdtemp(path.join(tmpdir(),'ez-host-advertised-'))
+  const workspace=path.join(root,'mind'),controlDir=path.join(root,'control'),directory=path.join(controlDir,'host-executor')
+  const abort=new AbortController();let server:Promise<void>|undefined
+  const previousPath=process.env.PATH
+  try {
+    await mkdir(workspace,{recursive:true});await mkdir(directory,{recursive:true})
+    const fakeBin=path.join(root,'bin');await mkdir(fakeBin,{recursive:true})
+    await writeFile(path.join(fakeBin,'codex'),'#!/bin/sh\nexit 0\n',{mode:0o700})
+    process.env.PATH=`${fakeBin}${path.delimiter}${previousPath ?? ''}`
+    const installation={cli:'grok' as const,agents:[{name:'test',workspace,controlDir,binDir:fakeBin}]}
+    const advertised=[{cli:'codex',model:'cached-model',name:'Cached',efforts:[]}]
+    let reads=0
+    server=serveHostExecutor(installation,abort.signal,async()=>{
+      const child=spawn(process.execPath,['-e','process.exit(0)'])
+      return {child,cleanup:async()=>{},stdout:''}
+    },async()=>{if(++reads>1)throw new Error('unexpected discovery during admission');return advertised})
+    for(let n=0;n<300;n++){try{await readFile(path.join(directory,'heartbeat.json'));break}catch{await new Promise(r=>setTimeout(r,20))}}
+    await readFile(path.join(directory,'heartbeat.json'))
+    await ownerRun(controlDir,'r_advertised')
+    await writeFile(path.join(directory,'r_advertised.request.json'),JSON.stringify({
+      texts:['hello'],options:{cli:'codex',model:'cached-model'},
+    }))
+    let events=''
+    for(let n=0;n<200;n++){
+      try{events=await readFile(path.join(directory,'r_advertised.events'),'utf8');if(events.includes('"stream":"exit"'))break}catch{}
+      await new Promise(r=>setTimeout(r,20))
+    }
+    assert.match(events,/"stream":"exit","code":0/)
+    assert.equal(reads,1)
+  } finally {
+    abort.abort();await server
+    if(previousPath===undefined)delete process.env.PATH;else process.env.PATH=previousPath
+    await rm(root,{recursive:true,force:true})
+  }
+})
+
+test('startup replaces prior catalog after provider policy changes even when discovery is empty',async()=>{
+  const root=await mkdtemp(path.join(tmpdir(),'ez-host-policy-reset-'))
+  const directory=path.join(root,'host-executor')
+  const abort=new AbortController();let server:Promise<void>|undefined
+  try {
+    await mkdir(directory)
+    await writeFile(path.join(directory,'models.json'),JSON.stringify([
+      {cli:'opencode',model:'old-provider/model',name:'Old provider',efforts:[]},
+    ]))
+    server=serveHostExecutor({cli:'grok',agents:[{
+      name:'test',workspace:root,controlDir:root,binDir:root,opencodeProviders:['allowed-provider'],
+    }]},abort.signal,undefined,async()=>[])
+    for(let n=0;n<300;n++){try{await readFile(path.join(directory,'heartbeat.json'));break}catch{await new Promise(r=>setTimeout(r,20))}}
+    await readFile(path.join(directory,'heartbeat.json'))
+    assert.deepEqual(JSON.parse(await readFile(path.join(directory,'models.json'),'utf8')),[])
+  } finally {abort.abort();await server;await rm(root,{recursive:true,force:true})}
 })

package/test/message-history.test.ts

@@ -10,6 +10,9 @@ import { serveTestLedger } from './helpers/ledger.js'
 import { deliveredMessages } from '../src/message-history.js'
 import { RunStore } from '../src/runs.js'
 import { ControlStore } from '../src/control-state.js'
+import { ownerId, ownerEpoch } from '../src/control-state.js'
+import { ApplicationBindings } from '../src/application-channel.js'
+import { randomBytes } from 'node:crypto'
 
 async function fixture(t: test.TestContext) {
   const dir = await mkdtemp(join(tmpdir(), 'ez-history-'))
@@ -117,3 +120,47 @@ test('CLI flushes complete long reports and rejects send options in history mode
   // History reads never create outbox state on disk.
   await assert.rejects(stat(join(dir, 'outbox')))
 })
+
+test('application history reads only delivered literal text in its current binding and scope', async t => {
+  const { dir, runs } = await fixture(t)
+  const owner = (await new ControlStore(dir, 1000).status()).owner!
+  const bindings = new ApplicationBindings(dir)
+  const first = (await bindings.register('first', randomBytes(32).toString('base64url'), owner))!
+  const second = (await bindings.register('second', randomBytes(32).toString('base64url'), owner))!
+  const create = async (id: string, bindingId: string, scope: string) => {
+    const run = await runs.create({ id, ownerId: ownerId(owner), ownerEpoch: ownerEpoch(owner),
+      texts: ['test'], application: { bindingId, scope, requestId: id } })
+    await runs.patch(id, { status: 'running' })
+    return run
+  }
+  const earlier = await create('r_app_earlier', first.bindingId, 'book')
+  const current = await create('r_app_current', first.bindingId, 'book')
+  const otherScope = await create('r_app_other_scope', first.bindingId, 'private')
+  const otherBinding = await create('r_app_other_binding', second.bindingId, 'book')
+  const deliver = async (runId: string, text: string) => {
+    const item = await runs.enqueueMessage(runId, text)
+    await runs.claimOutbox(item.id)
+    await runs.markOutboxSent(item.id)
+    return item
+  }
+  const literal = 'Book is $1,234; path C:\\reports\\$raw'
+  const firstItem = await deliver(earlier.id, literal)
+  await runs.patch(earlier.id, { status: 'completed' })
+  await deliver(otherScope.id, 'other scope secret')
+  await deliver(otherBinding.id, 'other binding secret')
+  await deliver('tg_1', 'Telegram secret')
+  await runs.enqueueMessage(current.id, 'queued is not delivered')
+  const env = { ...process.env, EZ_CONTROL_DIR: dir, EZ_RUN_ID: current.id }
+  const { stdout } = await promisify(execFile)(process.execPath, ['bin/ezenciel-agents-message.mjs', 'history'], { env })
+  const result = JSON.parse(stdout)
+  assert.equal(result.scope, 'book')
+  assert.deepEqual(result.messages.map((message: { id: string; text: string }) => ({ id: message.id, text: message.text })),
+    [{ id: firstItem.id, text: literal }])
+  assert.equal(result.hasMore, false)
+  await assert.rejects(promisify(execFile)(process.execPath,
+    ['bin/ezenciel-agents-message.mjs', 'history', '--message-id', '1'], { env }), /Telegram history/)
+  await bindings.register('first', null, owner)
+  await assert.rejects(deliveredMessages(dir, current.id), /revoked/)
+  await new ControlStore(dir, 1000).revokeOwner()
+  await assert.rejects(deliveredMessages(dir, otherBinding.id), /owner-mismatch|revoked/)
+})

package/test/model-policy.test.ts

@@ -12,7 +12,7 @@ import { runCodexSession } from '../src/codex-session.js'
 import { runDesktopTurn } from '../src/desktop-bridge.js'
 
 test('engine defaults stay omitted and explicit native settings survive every adapter', async () => {
- for(const cli of ['codex','codex-gui','grok','claude','opencode','agy']) {
+ for(const cli of ['codex','codex-gui','grok','claude','opencode']) {
   assert.deepEqual(executionDefaults(cli,{}),{})
   const preset={id:'chosen',name:'Chosen',cli,model:'native-model',effort:'ultra'}
   assert.deepEqual(executionDefaults(cli,preset),preset)
@@ -41,7 +41,7 @@ test('invalid setting syntax never mutates a saved choice', async () => {
 test('non-Codex catalog defaults survive executor normalization and host revalidation', async () => {
   const dir = await mkdtemp(join(tmpdir(), 'ez-adapter-defaults-'))
   try {
-    const available = async (cli: string) => ['claude', 'opencode', 'agy'].includes(cli)
+    const available = async (cli: string) => ['claude', 'opencode'].includes(cli)
     const catalog = await readModels(dir, available)
     for (const choice of catalog) {
       const preset = {id:'selected', name:choice.name, cli:choice.cli, model:choice.model}

package/test/setup.test.ts

@@ -13,11 +13,11 @@ test('findExecutableInPath locates existing binary and returns null for nonexist
   assert.equal(missing, null)
 })
 
-test('readActiveExecutor extracts EZ_EXECUTOR_CLI or defaults to agy', async () => {
+test('readActiveExecutor extracts EZ_EXECUTOR_CLI or defaults to codex', async () => {
   const dir = await mkdtemp(path.join(tmpdir(), 'ez-setup-test-'))
   try {
     const envPath = path.join(dir, '.env')
-    assert.equal(await readActiveExecutor(envPath), 'agy')
+    assert.equal(await readActiveExecutor(envPath), 'codex')
 
     await writeFile(envPath, 'EZ_EXECUTOR_CLI=claude\n', 'utf8')
     assert.equal(await readActiveExecutor(envPath), 'claude')
@@ -37,10 +37,10 @@ test('setExecutorInEnv updates or adds EZ_EXECUTOR_CLI without altering other en
     assert.match(content, /TELEGRAM_BOT_TOKEN=token123/)
     assert.match(content, /EZ_EXECUTOR_CLI=claude/)
 
-    await setExecutorInEnv(envPath, 'antigravity')
+    await setExecutorInEnv(envPath, 'codex')
     content = await readFile(envPath, 'utf8')
     assert.match(content, /TELEGRAM_BOT_TOKEN=token123/)
-    assert.match(content, /EZ_EXECUTOR_CLI=antigravity/)
+    assert.match(content, /EZ_EXECUTOR_CLI=codex/)
     assert.ok(!content.includes('claude'))
   } finally {
     await rm(dir, { recursive: true, force: true })
@@ -59,9 +59,9 @@ test('getExecutorsStatus returns all executors and sets isActive correctly', asy
     assert.ok(claudeItem)
     assert.equal(claudeItem.isActive, true)
 
-    const agyItem = status.items.find((item) => item.id === 'agy')
-    assert.ok(agyItem)
-    assert.equal(agyItem.isActive, false)
+    const codexItem = status.items.find((item) => item.id === 'codex')
+    assert.ok(codexItem)
+    assert.equal(codexItem.isActive, false)
   } finally {
     await rm(dir, { recursive: true, force: true })
   }