@cjhyy/code-shell 0.1.0-alpha.0 → 0.1.0-alpha.2

package/CHANGELOG.md

@@ -8,6 +8,45 @@ breaking.
 
 ## [Unreleased]
 
+## [0.1.0-alpha.1] - 2026-04-30
+
+### Changed (breaking)
+- **Tool timeout system rewritten.** Removed the hardcoded
+  `LEGACY_LONG_TIMEOUT_TOOLS = {Agent, Arena}` whitelist in
+  `tool-system/registry.ts`. Tools now declare their own timeout via
+  `RegisteredTool.timeoutMs` at registration time. Precedence:
+  `executeTool(opts.timeoutMs)` > `tool.timeoutMs` > `DEFAULT_TOOL_TIMEOUT_MS`
+  (120s). Custom long-running tools registered via `engine.registerCustomTool`
+  can now set a higher timeout instead of being silently capped at 120s.
+- **Bash internal 600s cap removed.** `bash.ts` no longer clamps the
+  user-supplied `timeout` argument. The outer registry caps via the tool's
+  declared `timeoutMs` (default 1h for Bash). Long-running shell loops
+  (`until cond; do ...; done`) are now feasible.
+- **Agent `max_turns` upper bound (30) removed.** Sub-agents that need to do
+  more turns (deep research, large refactors) are no longer artificially
+  capped. Default remains 15.
+- **Sub-agent LLM call timeout (60s) removed.** `agent.ts` no longer clamps
+  `subAgentConfig.llm.timeout` to 60s, which was breaking slow models
+  (e.g. extended thinking).
+
+### Added
+- **`Agent(run_in_background: true)`** — fire-and-forget sub-agents. Returns
+  an `agent_id` immediately instead of blocking the parent turn. The agent
+  runs detached in the same process; restarting loses its state.
+- **`AgentStatus(agent_id?)`** — query background agent state
+  (running / completed / failed / cancelled), or list all when `agent_id` is
+  omitted. Returns the result text once completed.
+- **`AgentCancel(agent_id)`** — abort a running background agent.
+- New module `src/tool-system/builtin/agent-registry.ts` — in-process
+  registry for async agent handles.
+
+### Notes
+- Cross-process / restart-survivable long tasks still belong to `RunManager`
+  in `@cjhyy/code-shell/run`, not to `Agent(run_in_background)`. The split
+  mirrors Claude Code's REPL/Agent-tool/Routines architecture.
+
+## [0.1.0-alpha.0] - 2026-04-28
+
 ### Added
 - **`IterativeArena` — multi-model authoring loop.** Pipeline: tournament v1
   (every participant writes a draft, the author merges anonymized drafts into

package/README.md

@@ -175,3 +175,11 @@ bun run tsc --noEmit
 ```
 
 `bun run tsc --noEmit` currently reports many pre-existing repo-wide issues outside the preset/framework changes, so treat typecheck as a global health signal rather than a clean gate for just this slice.
+
+## Acknowledgments
+
+The `ApplyPatch` tool (`src/tool-system/builtin/apply-patch/`) is adapted from
+[OpenAI Codex `codex-rs/apply-patch`](https://github.com/openai/codex/tree/main/codex-rs/apply-patch),
+licensed under the Apache License 2.0. See `NOTICE.md` and `LICENSE-codex` in
+that directory for details, including the intentional behavioral divergence
+where our applier rolls back partial writes on failure.

package/dist/anthropic-P5VETAFI.cjs

@@ -0,0 +1,10 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+var _chunkBUJ5KYCIcjs = require('./chunk-BUJ5KYCI.cjs');
+require('./chunk-GZBD6QRS.cjs');
+require('./chunk-EL2RL5DG.cjs');
+require('./chunk-JHNCK7JP.cjs');
+require('./chunk-IJSHQGMP.cjs');
+
+
+exports.AnthropicClient = _chunkBUJ5KYCIcjs.AnthropicClient;

package/dist/{anthropic-NENYS535.js → anthropic-W2GU3D76.js}

@@ -1,8 +1,9 @@
 import {
   AnthropicClient
-} from "./chunk-YZ25SSWJ.js";
-import "./chunk-O6F2EF2Z.js";
+} from "./chunk-M2SVOKC6.js";
+import "./chunk-SCDKLTN3.js";
 import "./chunk-FUOKLKR2.js";
+import "./chunk-ZRVPCXI7.js";
 import "./chunk-DI7RDLOS.js";
 export {
   AnthropicClient

package/dist/arena/context/context-tools.d.ts

@@ -8,7 +8,7 @@
  */
 import type { ToolDefinition, ToolCall } from "../../types.js";
 export declare const MAX_TOOL_RESULT = 15000;
-export declare const MAX_TOOL_ROUNDS = 5;
+export declare const MAX_TOOL_ROUNDS = 3;
 export declare const CONTEXT_TOOLS: ToolDefinition[];
 /**
  * Execute a context tool call and return the result string.

package/dist/arena/index.cjs

@@ -5,7 +5,7 @@
 
 
 
-var _chunk3EUDE77Ecjs = require('../chunk-3EUDE77E.cjs');
+var _chunkX2DNIMPCcjs = require('../chunk-X2DNIMPC.cjs');
 
 
 
@@ -48,9 +48,9 @@ var _chunk3EUDE77Ecjs = require('../chunk-3EUDE77E.cjs');
 
 
 
-var _chunkFVP7XJGScjs = require('../chunk-FVP7XJGS.cjs');
-require('../chunk-IMMTBZ33.cjs');
+var _chunkHOXQLX5Rcjs = require('../chunk-HOXQLX5R.cjs');
 require('../chunk-EL2RL5DG.cjs');
+require('../chunk-JHNCK7JP.cjs');
 require('../chunk-IJSHQGMP.cjs');
 
 
@@ -100,4 +100,4 @@ require('../chunk-IJSHQGMP.cjs');
 
 
 
-exports.Arena = _chunkFVP7XJGScjs.Arena; exports.ArenaLedger = _chunkFVP7XJGScjs.ArenaLedger; exports.DiscussionStrategy = _chunkFVP7XJGScjs.DiscussionStrategy; exports.IterativeArena = _chunk3EUDE77Ecjs.IterativeArena; exports.LENS_NAMES = _chunkFVP7XJGScjs.LENS_NAMES; exports.MODEL_PRESETS = _chunkFVP7XJGScjs.MODEL_PRESETS; exports.PlanningStrategy = _chunkFVP7XJGScjs.PlanningStrategy; exports.ReviewStrategy = _chunkFVP7XJGScjs.ReviewStrategy; exports.applyReviewResult = _chunkFVP7XJGScjs.applyReviewResult; exports.buildConsensus = _chunkFVP7XJGScjs.buildConsensus; exports.buildDigest = _chunkFVP7XJGScjs.buildDigest; exports.buildLensPrompt = _chunkFVP7XJGScjs.buildLensPrompt; exports.collectEvidence = _chunkFVP7XJGScjs.collectEvidence; exports.createProgressRenderer = _chunkFVP7XJGScjs.createProgressRenderer; exports.defaultIterateConvergence = _chunk3EUDE77Ecjs.defaultConvergence; exports.formatArenaResult = _chunkFVP7XJGScjs.formatArenaResult; exports.formatArenaResultForSession = _chunkFVP7XJGScjs.formatArenaResultForSession; exports.formatDigest = _chunkFVP7XJGScjs.formatDigest; exports.getIterateFormat = _chunk3EUDE77Ecjs.getFormat; exports.getLens = _chunkFVP7XJGScjs.getLens; exports.getMaxOutputTokens = _chunkFVP7XJGScjs.getMaxOutputTokens; exports.getStrategy = _chunkFVP7XJGScjs.getStrategy; exports.getStrategyForPlan = _chunkFVP7XJGScjs.getStrategyForPlan; exports.hasTools = _chunkFVP7XJGScjs.hasTools; exports.isStrategyV2 = _chunkFVP7XJGScjs.isStrategyV2; exports.isTerminal = _chunkFVP7XJGScjs.isTerminal; exports.iterateCodeFormat = _chunk3EUDE77Ecjs.codeFormat; exports.iterateDiffRatio = _chunk3EUDE77Ecjs.diffRatio; exports.iterateDocumentFormat = _chunk3EUDE77Ecjs.documentFormat; exports.markUnderReview = _chunkFVP7XJGScjs.markUnderReview; exports.markUnresolved = _chunkFVP7XJGScjs.markUnresolved; exports.planArena = _chunkFVP7XJGScjs.planArena; exports.printArenaResult = _chunkFVP7XJGScjs.printArenaResult; exports.registerClaims = _chunkFVP7XJGScjs.registerClaims; exports.renderProgress = _chunkFVP7XJGScjs.renderProgress; exports.resolveClaimStatus = _chunkFVP7XJGScjs.resolveClaimStatus; exports.resolveLenses = _chunkFVP7XJGScjs.resolveLenses; exports.runAdjudication = _chunkFVP7XJGScjs.runAdjudication; exports.runCrossReview = _chunkFVP7XJGScjs.runCrossReview; exports.runDebateRounds = _chunkFVP7XJGScjs.runDebateRounds; exports.runParticipantResearch = _chunkFVP7XJGScjs.runParticipantResearch; exports.runParticipantResearchWithDossiers = _chunkFVP7XJGScjs.runParticipantResearchWithDossiers; exports.runVerificationReview = _chunkFVP7XJGScjs.runVerificationReview; exports.selectClaimsForReview = _chunkFVP7XJGScjs.selectClaimsForReview; exports.selectTools = _chunkFVP7XJGScjs.selectTools; exports.transitionClaim = _chunkFVP7XJGScjs.transitionClaim; exports.validTransitions = _chunkFVP7XJGScjs.validTransitions;
+exports.Arena = _chunkHOXQLX5Rcjs.Arena; exports.ArenaLedger = _chunkHOXQLX5Rcjs.ArenaLedger; exports.DiscussionStrategy = _chunkHOXQLX5Rcjs.DiscussionStrategy; exports.IterativeArena = _chunkX2DNIMPCcjs.IterativeArena; exports.LENS_NAMES = _chunkHOXQLX5Rcjs.LENS_NAMES; exports.MODEL_PRESETS = _chunkHOXQLX5Rcjs.MODEL_PRESETS; exports.PlanningStrategy = _chunkHOXQLX5Rcjs.PlanningStrategy; exports.ReviewStrategy = _chunkHOXQLX5Rcjs.ReviewStrategy; exports.applyReviewResult = _chunkHOXQLX5Rcjs.applyReviewResult; exports.buildConsensus = _chunkHOXQLX5Rcjs.buildConsensus; exports.buildDigest = _chunkHOXQLX5Rcjs.buildDigest; exports.buildLensPrompt = _chunkHOXQLX5Rcjs.buildLensPrompt; exports.collectEvidence = _chunkHOXQLX5Rcjs.collectEvidence; exports.createProgressRenderer = _chunkHOXQLX5Rcjs.createProgressRenderer; exports.defaultIterateConvergence = _chunkX2DNIMPCcjs.defaultConvergence; exports.formatArenaResult = _chunkHOXQLX5Rcjs.formatArenaResult; exports.formatArenaResultForSession = _chunkHOXQLX5Rcjs.formatArenaResultForSession; exports.formatDigest = _chunkHOXQLX5Rcjs.formatDigest; exports.getIterateFormat = _chunkX2DNIMPCcjs.getFormat; exports.getLens = _chunkHOXQLX5Rcjs.getLens; exports.getMaxOutputTokens = _chunkHOXQLX5Rcjs.getMaxOutputTokens; exports.getStrategy = _chunkHOXQLX5Rcjs.getStrategy; exports.getStrategyForPlan = _chunkHOXQLX5Rcjs.getStrategyForPlan; exports.hasTools = _chunkHOXQLX5Rcjs.hasTools; exports.isStrategyV2 = _chunkHOXQLX5Rcjs.isStrategyV2; exports.isTerminal = _chunkHOXQLX5Rcjs.isTerminal; exports.iterateCodeFormat = _chunkX2DNIMPCcjs.codeFormat; exports.iterateDiffRatio = _chunkX2DNIMPCcjs.diffRatio; exports.iterateDocumentFormat = _chunkX2DNIMPCcjs.documentFormat; exports.markUnderReview = _chunkHOXQLX5Rcjs.markUnderReview; exports.markUnresolved = _chunkHOXQLX5Rcjs.markUnresolved; exports.planArena = _chunkHOXQLX5Rcjs.planArena; exports.printArenaResult = _chunkHOXQLX5Rcjs.printArenaResult; exports.registerClaims = _chunkHOXQLX5Rcjs.registerClaims; exports.renderProgress = _chunkHOXQLX5Rcjs.renderProgress; exports.resolveClaimStatus = _chunkHOXQLX5Rcjs.resolveClaimStatus; exports.resolveLenses = _chunkHOXQLX5Rcjs.resolveLenses; exports.runAdjudication = _chunkHOXQLX5Rcjs.runAdjudication; exports.runCrossReview = _chunkHOXQLX5Rcjs.runCrossReview; exports.runDebateRounds = _chunkHOXQLX5Rcjs.runDebateRounds; exports.runParticipantResearch = _chunkHOXQLX5Rcjs.runParticipantResearch; exports.runParticipantResearchWithDossiers = _chunkHOXQLX5Rcjs.runParticipantResearchWithDossiers; exports.runVerificationReview = _chunkHOXQLX5Rcjs.runVerificationReview; exports.selectClaimsForReview = _chunkHOXQLX5Rcjs.selectClaimsForReview; exports.selectTools = _chunkHOXQLX5Rcjs.selectTools; exports.transitionClaim = _chunkHOXQLX5Rcjs.transitionClaim; exports.validTransitions = _chunkHOXQLX5Rcjs.validTransitions;

package/dist/arena/index.js

@@ -5,7 +5,7 @@ import {
   diffRatio,
   documentFormat,
   getFormat
-} from "../chunk-ZXYDDJEJ.js";
+} from "../chunk-OUC2DFA7.js";
 import {
   Arena,
   ArenaLedger,
@@ -48,9 +48,9 @@ import {
   selectTools,
   transitionClaim,
   validTransitions
-} from "../chunk-SQZHPD3S.js";
-import "../chunk-X4HAERTQ.js";
+} from "../chunk-Y7TSCDF6.js";
 import "../chunk-FUOKLKR2.js";
+import "../chunk-ZRVPCXI7.js";
 import "../chunk-DI7RDLOS.js";
 export {
   Arena,

package/dist/arena/providers/index.d.ts

@@ -1,16 +1,32 @@
 /**
  * Provider registry — evidence collectors for Arena.
  */
-import type { ArenaPlan, ArenaArtifact, ArenaQuickFact } from "../types.js";
+import type { ArenaPlan, ArenaArtifact, ArenaSourceKind, ArenaQuickFact } from "../types.js";
 export { gitProvider } from "./git.js";
 export { repoProvider } from "./repo.js";
 export { docsProvider } from "./docs.js";
 export { noneProvider } from "./none.js";
+export interface CollectEvidenceOptions {
+    /** Heartbeat callback fired before/after each provider runs. */
+    onProgress?: (event: {
+        type: "evidence_started" | "evidence_collected";
+        source: ArenaSourceKind;
+        count?: number;
+        durationMs?: number;
+        timedOut?: boolean;
+    }) => void;
+    signal?: AbortSignal;
+}
 /**
  * Collect all evidence according to the plan's sources.
  * Returns unified ArenaArtifact[] and quickFacts.
+ *
+ * Providers run in parallel (independent of one another) with a
+ * per-provider timeout, so a single slow source can't stall the
+ * whole arena. Heartbeats are emitted around each provider so the
+ * UI can show "collecting from repo..." instead of a blank pause.
  */
-export declare function collectEvidence(plan: ArenaPlan, topic: string): {
+export declare function collectEvidence(plan: ArenaPlan, topic: string, options?: CollectEvidenceOptions): Promise<{
     artifacts: ArenaArtifact[];
     quickFacts: ArenaQuickFact[];
-};
+}>;

package/dist/arena/strategies/utils.d.ts

@@ -10,7 +10,12 @@ export declare function formatBaseContext(ctx: ArenaBaseContext): string;
 export declare function formatReports(reports: ParticipantReport[]): string;
 /** Format finding reviews for consensus prompts */
 export declare function formatFindingReviews(reviews: FindingReview[]): string;
-/** Parse a ParticipantReport from LLM JSON output */
+/**
+ * Parse a ParticipantReport. The research prompt now asks for an
+ * XML <report> element because thinking-mode models (DeepSeek V4)
+ * produced malformed JSON often enough to derail the loop. We try
+ * XML first, then JSON, then a free-text salvage.
+ */
 export declare function parseReport(participant: string, text: string): ParticipantReport;
 /** Parse FindingReview[] from LLM JSON output */
 export declare function parseReviews(reviewer: string, text: string): FindingReview[];

package/dist/arena/types.d.ts

@@ -71,7 +71,7 @@ export interface ArenaToolPack {
 /** Context provider interface — collects evidence from a source */
 export interface ArenaContextProvider {
     kind: ArenaSourceKind;
-    collect(plan: ArenaPlan, topic: string): ArenaArtifact[];
+    collect(plan: ArenaPlan, topic: string): ArenaArtifact[] | Promise<ArenaArtifact[]>;
 }
 /** Quick fact — high-signal summary entry */
 export interface ArenaQuickFact {
@@ -440,6 +440,15 @@ export interface ArenaConfig {
 export type ArenaProgressEvent = {
     type: "plan_resolved";
     plan: ArenaPlan;
+} | {
+    type: "evidence_started";
+    source: ArenaSourceKind;
+} | {
+    type: "evidence_source_done";
+    source: ArenaSourceKind;
+    count: number;
+    durationMs: number;
+    timedOut: boolean;
 } | {
     type: "evidence_collected";
     artifacts: ArenaArtifact[];

package/dist/{arena-46QQ6BZQ.js → arena-ENHBHB2W.js}

@@ -1,10 +1,9 @@
 import {
   ModelPool
-} from "./chunk-KO2FPF7G.js";
+} from "./chunk-F5BS3GUC.js";
 import {
-  SettingsManager,
-  init_manager
-} from "./chunk-6ZIROYXX.js";
+  SettingsManager
+} from "./chunk-75E4BBFC.js";
 import {
   Arena,
   MODEL_PRESETS,
@@ -13,9 +12,9 @@ import {
   getMaxOutputTokens,
   printArenaResult,
   renderProgress
-} from "./chunk-SQZHPD3S.js";
-import "./chunk-X4HAERTQ.js";
+} from "./chunk-Y7TSCDF6.js";
 import "./chunk-FUOKLKR2.js";
+import "./chunk-ZRVPCXI7.js";
 import {
   init_esm_shims
 } from "./chunk-DI7RDLOS.js";
@@ -23,7 +22,6 @@ import {
 // src/cli/commands/arena.ts
 init_esm_shims();
 import chalk from "chalk";
-init_manager();
 async function runArenaReview(arg, engineConfig, opts) {
   const { models: modelsFlag, mode: explicitMode, base, head, topic } = parseFlags(arg);
   const out = opts?.output ?? ((text) => console.log(text));

package/dist/{arena-HZZZ2GJH.cjs → arena-HHDYYVHJ.cjs}

@@ -1,10 +1,10 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
-var _chunkUK2SU23Scjs = require('./chunk-UK2SU23S.cjs');
+var _chunkKOGV6PDQcjs = require('./chunk-KOGV6PDQ.cjs');
 
 
+var _chunkFV2ARONZcjs = require('./chunk-FV2ARONZ.cjs');
 
-var _chunkFGZGCFJXcjs = require('./chunk-FGZGCFJX.cjs');
 
 
 
@@ -12,10 +12,9 @@ var _chunkFGZGCFJXcjs = require('./chunk-FGZGCFJX.cjs');
 
 
 
-
-var _chunkFVP7XJGScjs = require('./chunk-FVP7XJGS.cjs');
-require('./chunk-IMMTBZ33.cjs');
+var _chunkHOXQLX5Rcjs = require('./chunk-HOXQLX5R.cjs');
 require('./chunk-EL2RL5DG.cjs');
+require('./chunk-JHNCK7JP.cjs');
 
 
 var _chunkIJSHQGMPcjs = require('./chunk-IJSHQGMP.cjs');
@@ -23,7 +22,6 @@ var _chunkIJSHQGMPcjs = require('./chunk-IJSHQGMP.cjs');
 // src/cli/commands/arena.ts
 _chunkIJSHQGMPcjs.init_cjs_shims.call(void 0, );
 var _chalk = require('chalk'); var _chalk2 = _interopRequireDefault(_chalk);
-_chunkFGZGCFJXcjs.init_manager.call(void 0, );
 async function runArenaReview(arg, engineConfig, opts) {
   const { models: modelsFlag, mode: explicitMode, base, head, topic } = parseFlags(arg);
   const out = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _ => _.output]), () => ( ((text) => console.log(text))));
@@ -40,8 +38,8 @@ async function runArenaReview(arg, engineConfig, opts) {
   out(_chalk2.default.bold(`\u2550\u2550\u2550 Arena ${modeLabel} \u2550\u2550\u2550`));
   out(_chalk2.default.dim(`Topic:  ${topic}`));
   out(_chalk2.default.dim(`Models: ${participants.map((p) => p.name).join(" vs ")}`));
-  const progressRenderer = _optionalChain([opts, 'optionalAccess', _2 => _2.output]) ? _chunkFVP7XJGScjs.createProgressRenderer.call(void 0, opts.output) : _chunkFVP7XJGScjs.renderProgress;
-  const arena = new (0, _chunkFVP7XJGScjs.Arena)({
+  const progressRenderer = _optionalChain([opts, 'optionalAccess', _2 => _2.output]) ? _chunkHOXQLX5Rcjs.createProgressRenderer.call(void 0, opts.output) : _chunkHOXQLX5Rcjs.renderProgress;
+  const arena = new (0, _chunkHOXQLX5Rcjs.Arena)({
     participants,
     mode: explicitMode,
     enableContextTools: true,
@@ -55,9 +53,9 @@ async function runArenaReview(arg, engineConfig, opts) {
     });
     const resultSink = _nullishCoalesce(_optionalChain([opts, 'optionalAccess', _3 => _3.outputMessage]), () => ( _optionalChain([opts, 'optionalAccess', _4 => _4.output])));
     if (resultSink) {
-      resultSink(_chunkFVP7XJGScjs.formatArenaResultForSession.call(void 0, result));
+      resultSink(_chunkHOXQLX5Rcjs.formatArenaResultForSession.call(void 0, result));
     } else {
-      _chunkFVP7XJGScjs.printArenaResult.call(void 0, result);
+      _chunkHOXQLX5Rcjs.printArenaResult.call(void 0, result);
     }
     return result;
   } catch (err) {
@@ -66,9 +64,9 @@ async function runArenaReview(arg, engineConfig, opts) {
   }
 }
 function buildModelPool(engineConfig) {
-  const pool = new (0, _chunkUK2SU23Scjs.ModelPool)();
+  const pool = new (0, _chunkKOGV6PDQcjs.ModelPool)();
   try {
-    const settings = new (0, _chunkFGZGCFJXcjs.SettingsManager)(process.cwd()).get();
+    const settings = new (0, _chunkFV2ARONZcjs.SettingsManager)(process.cwd()).get();
     if (_optionalChain([settings, 'access', _5 => _5.models, 'optionalAccess', _6 => _6.length])) {
       for (const m of settings.models) {
         pool.register({
@@ -98,7 +96,7 @@ function resolveOneParticipant(entry, pool, engineConfig) {
         apiKey: _nullishCoalesce(m.apiKey, () => ( engineConfig.llm.apiKey)),
         baseUrl: _nullishCoalesce(m.baseUrl, () => ( engineConfig.llm.baseUrl)),
         temperature: 0.3,
-        maxTokens: _nullishCoalesce(m.maxOutputTokens, () => ( _chunkFVP7XJGScjs.getMaxOutputTokens.call(void 0, m.model))),
+        maxTokens: _nullishCoalesce(m.maxOutputTokens, () => ( _chunkHOXQLX5Rcjs.getMaxOutputTokens.call(void 0, m.model))),
         enableStreaming: false
       }
     };
@@ -111,7 +109,7 @@ function resolveOneParticipant(entry, pool, engineConfig) {
       apiKey: _nullishCoalesce(entry.apiKey, () => ( engineConfig.llm.apiKey)),
       baseUrl: _nullishCoalesce(entry.baseUrl, () => ( engineConfig.llm.baseUrl)),
       temperature: 0.3,
-      maxTokens: _chunkFVP7XJGScjs.getMaxOutputTokens.call(void 0, entry.model),
+      maxTokens: _chunkHOXQLX5Rcjs.getMaxOutputTokens.call(void 0, entry.model),
       enableStreaming: false
     }
   };
@@ -131,12 +129,12 @@ function resolveParticipants(engineConfig, modelsFlag) {
             apiKey: _nullishCoalesce(fromPool.apiKey, () => ( engineConfig.llm.apiKey)),
             baseUrl: _nullishCoalesce(fromPool.baseUrl, () => ( engineConfig.llm.baseUrl)),
             temperature: 0.3,
-            maxTokens: _nullishCoalesce(fromPool.maxOutputTokens, () => ( _chunkFVP7XJGScjs.getMaxOutputTokens.call(void 0, fromPool.model))),
+            maxTokens: _nullishCoalesce(fromPool.maxOutputTokens, () => ( _chunkHOXQLX5Rcjs.getMaxOutputTokens.call(void 0, fromPool.model))),
             enableStreaming: false
           }
         };
       }
-      const preset = _chunkFVP7XJGScjs.MODEL_PRESETS[name];
+      const preset = _chunkHOXQLX5Rcjs.MODEL_PRESETS[name];
       if (preset) {
         return {
           name: modelDisplayName(preset.model),
@@ -157,7 +155,7 @@ function resolveParticipants(engineConfig, modelsFlag) {
       };
     });
   }
-  const settings = new (0, _chunkFGZGCFJXcjs.SettingsManager)(process.cwd()).get();
+  const settings = new (0, _chunkFV2ARONZcjs.SettingsManager)(process.cwd()).get();
   if (_optionalChain([settings, 'access', _7 => _7.arena, 'optionalAccess', _8 => _8.participants, 'optionalAccess', _9 => _9.length]) >= 2) {
     const resolved = settings.arena.participants.map((p) => resolveOneParticipant(p, pool, engineConfig)).filter((p) => p !== void 0);
     if (resolved.length >= 2) return resolved;
@@ -167,7 +165,7 @@ function resolveParticipants(engineConfig, modelsFlag) {
       name: modelDisplayName(engineConfig.llm.model),
       llm: {
         ...engineConfig.llm,
-        maxTokens: _chunkFVP7XJGScjs.getMaxOutputTokens.call(void 0, engineConfig.llm.model),
+        maxTokens: _chunkHOXQLX5Rcjs.getMaxOutputTokens.call(void 0, engineConfig.llm.model),
         enableStreaming: false
       }
     }
@@ -180,7 +178,7 @@ function resolveParticipants(engineConfig, modelsFlag) {
       llm: {
         ...engineConfig.llm,
         model: opponent,
-        maxTokens: _chunkFVP7XJGScjs.getMaxOutputTokens.call(void 0, opponent),
+        maxTokens: _chunkHOXQLX5Rcjs.getMaxOutputTokens.call(void 0, opponent),
         enableStreaming: false
       }
     });
@@ -234,7 +232,7 @@ function formatUsage() {
     "  --base <ref>   Base branch/ref for comparison",
     "  --head <ref>   Head branch/ref (default: HEAD)",
     "",
-    `${_chalk2.default.dim("Available model presets:")} ${Object.keys(_chunkFVP7XJGScjs.MODEL_PRESETS).join(", ")}`
+    `${_chalk2.default.dim("Available model presets:")} ${Object.keys(_chunkHOXQLX5Rcjs.MODEL_PRESETS).join(", ")}`
   ].join("\n");
 }
 function formatModelHelp(engineConfig) {
@@ -258,4 +256,4 @@ function modelDisplayName(model) {
 
 
 
-exports.formatArenaResultForSession = _chunkFVP7XJGScjs.formatArenaResultForSession; exports.runArenaReview = runArenaReview;
+exports.formatArenaResultForSession = _chunkHOXQLX5Rcjs.formatArenaResultForSession; exports.runArenaReview = runArenaReview;

package/dist/{chunk-BE6IPRDM.js → chunk-2EUAE7AY.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-X4HAERTQ.js";
+} from "./chunk-ZRVPCXI7.js";
 import {
   init_esm_shims
 } from "./chunk-DI7RDLOS.js";

package/dist/{chunk-WFQF3RT4.cjs → chunk-3CAZIWUA.cjs}

@@ -4,7 +4,7 @@
 
 
 
-var _chunkQHDYFC5Ucjs = require('./chunk-QHDYFC5U.cjs');
+var _chunkVWFET3MGcjs = require('./chunk-VWFET3MG.cjs');
 
 
 var _chunkIJSHQGMPcjs = require('./chunk-IJSHQGMP.cjs');
@@ -61,12 +61,12 @@ function defineProduct(definition, runtime) {
     builtinTools: [...enabledSet],
     defaultPermissionRules: permissionRules
   };
-  _chunkQHDYFC5Ucjs.registerPreset.call(void 0, agentPreset);
+  _chunkVWFET3MGcjs.registerPreset.call(void 0, agentPreset);
   let evaluator;
   if (!_optionalChain([contract, 'optionalAccess', _4 => _4.evaluator])) {
-    evaluator = new (0, _chunkQHDYFC5Ucjs.NoopEvaluator)();
+    evaluator = new (0, _chunkVWFET3MGcjs.NoopEvaluator)();
   } else if (Array.isArray(contract.evaluator)) {
-    evaluator = new (0, _chunkQHDYFC5Ucjs.CompositeEvaluator)(contract.evaluator);
+    evaluator = new (0, _chunkVWFET3MGcjs.CompositeEvaluator)(contract.evaluator);
   } else {
     evaluator = contract.evaluator;
   }
@@ -76,8 +76,8 @@ function defineProduct(definition, runtime) {
     execute: ct.execute
   }));
   const runsDir = _nullishCoalesce(runtime.runsDir, () => ( _path.join.call(void 0, _os.homedir.call(void 0, ), ".code-shell", "runs")));
-  const store = new (0, _chunkQHDYFC5Ucjs.FileRunStore)(runsDir);
-  const manager = new (0, _chunkQHDYFC5Ucjs.RunManager)({
+  const store = new (0, _chunkVWFET3MGcjs.FileRunStore)(runsDir);
+  const manager = new (0, _chunkVWFET3MGcjs.RunManager)({
     store,
     executor: {
       llm: runtime.llm,
@@ -90,11 +90,14 @@ function defineProduct(definition, runtime) {
       disabledBuiltinTools: _optionalChain([adapter, 'optionalAccess', _9 => _9.disableTools]),
       customSystemPrompt: presetDef.customPrompt,
       appendSystemPrompt: presetDef.appendPrompt,
+      hooks: _optionalChain([adapter, 'optionalAccess', _10 => _10.hooks]),
       customTools: customToolEntries.length > 0 ? customToolEntries : void 0
     },
-    concurrency: _nullishCoalesce(_optionalChain([contract, 'optionalAccess', _10 => _10.concurrency]), () => ( 1)),
+    concurrency: _nullishCoalesce(_optionalChain([contract, 'optionalAccess', _11 => _11.concurrency]), () => ( 1)),
     runsDir,
-    evaluator
+    evaluator,
+    defaultTags: _optionalChain([contract, 'optionalAccess', _12 => _12.defaultTags]),
+    defaultMetadata: _optionalChain([contract, 'optionalAccess', _13 => _13.defaultMetadata])
   });
   return { manager, preset: agentPreset, customTools };
 }

package/dist/{chunk-J5XW6UYL.js → chunk-5C5HIOML.js}

@@ -1,13 +1,72 @@
-import {
-  estimateMessagesTokens,
-  init_token_counter
-} from "./chunk-4RRUP4MM.js";
 import {
   __esm,
   __export,
   init_esm_shims
 } from "./chunk-DI7RDLOS.js";
 
+// src/context/token-counter.ts
+function estimateStringTokens(text) {
+  if (!text) return 0;
+  const cjkChars = (text.match(/[\u4e00-\u9fff\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/g) ?? []).length;
+  const cjkRatio = cjkChars / text.length;
+  if (cjkRatio > 0.3) {
+    const cjkTokens = cjkChars / RATIOS.cjk;
+    const otherChars = text.length - cjkChars;
+    const otherTokens = otherChars / RATIOS.english;
+    return Math.ceil(cjkTokens + otherTokens);
+  }
+  const codeIndicators = ["{", "}", "(", ")", ";", "=>", "import ", "function ", "class ", "const "];
+  const codeScore = codeIndicators.reduce((s, ind) => s + (text.includes(ind) ? 1 : 0), 0);
+  if (codeScore >= 3) return Math.ceil(text.length / RATIOS.code);
+  if (text.startsWith("{") || text.startsWith("[")) return Math.ceil(text.length / RATIOS.json);
+  return Math.ceil(text.length / RATIOS.english);
+}
+function estimateMessagesTokens(messages) {
+  let total = 0;
+  for (const msg of messages) {
+    total += 4;
+    if (typeof msg.content === "string") {
+      total += estimateStringTokens(msg.content);
+    } else if (Array.isArray(msg.content)) {
+      for (const block of msg.content) {
+        total += estimateBlockTokens(block);
+      }
+    }
+  }
+  return total;
+}
+function estimateBlockTokens(block) {
+  let tokens = 2;
+  if (block.text) tokens += estimateStringTokens(block.text);
+  if (block.content && typeof block.content === "string") {
+    tokens += estimateStringTokens(block.content);
+  }
+  if (block.input) {
+    tokens += estimateStringTokens(JSON.stringify(block.input));
+  }
+  if (block.name) tokens += estimateStringTokens(block.name);
+  return tokens;
+}
+var RATIOS;
+var init_token_counter = __esm({
+  "src/context/token-counter.ts"() {
+    "use strict";
+    init_esm_shims();
+    RATIOS = {
+      english: 4,
+      // ~4 chars per token for English prose
+      code: 3.2,
+      // ~3.2 chars per token for code (more tokens per char)
+      json: 3.5,
+      // JSON structures
+      mixed: 3.6,
+      // Mixed content (typical for tool results)
+      cjk: 1.5
+      // CJK characters: ~1.5 chars per token
+    };
+  }
+});
+
 // src/context/compaction.ts
 var compaction_exports = {};
 __export(compaction_exports, {