Cleanup before 2.0.0 release

Author: ddebowczyk

.beads/issues.jsonl

@@ -33,9 +33,9 @@ jobs:
           - local: 'packages/config'
             repo:  'cognesy/instructor-config'
             name:  'instructor-config'
-          - local: 'packages/doctor'
-            repo:  'cognesy/instructor-doctor'
-            name:  'instructor-doctor'
+          - local: 'packages/doctools'
+            repo:  'cognesy/instructor-doctools'
+            name:  'instructor-doctools'
           - local: 'packages/dynamic'
             repo:  'cognesy/instructor-dynamic'
             name:  'instructor-dynamic'

.github/workflows/split.yml

@@ -33,9 +33,9 @@ jobs:
           - local: 'packages/config'
             repo:  'cognesy/instructor-config'
             name:  'instructor-config'
-          - local: 'packages/doctor'
-            repo:  'cognesy/instructor-doctor'
-            name:  'instructor-doctor'
+          - local: 'packages/doctools'
+            repo:  'cognesy/instructor-doctools'
+            name:  'instructor-doctools'
           - local: 'packages/dynamic'
             repo:  'cognesy/instructor-dynamic'
             name:  'instructor-dynamic'

.github/workflows/split.yml.bak

@@ -107,7 +107,7 @@
             "Cognesy\\AgentCtrl\\": "packages/agent-ctrl/src/",
             "Cognesy\\Auxiliary\\": "packages/auxiliary/src/",
             "Cognesy\\Config\\": "packages/config/src/",
-            "Cognesy\\Doctor\\": "packages/doctor/src/",
+            "Cognesy\\Doctools\\": "packages/doctools/src/",
             "Cognesy\\Dynamic\\": "packages/dynamic/src/",
             "Cognesy\\Events\\": "packages/events/src/",
             "Cognesy\\Http\\": "packages/http-client/src/",
@@ -156,7 +156,7 @@
             "Cognesy\\Templates\\Tests\\": "packages/templates/tests/",
             "Cognesy\\Utils\\Tests\\": "packages/utils/tests/",
             "Cognesy\\Auxiliary\\Tests\\": "packages/auxiliary/tests/",
-            "Cognesy\\Doctor\\Tests\\": "packages/doctor/tests/",
+            "Cognesy\\Doctools\\Tests\\": "packages/doctools/tests/",
             "Cognesy\\Evals\\Tests\\": "packages/evals/tests/",
             "Cognesy\\Experimental\\Tests\\": "packages/experimental/tests/",
             "Cognesy\\InstructorHub\\Tests\\": "packages/hub/tests/",

composer.json

@@ -38,7 +38,7 @@ function printCostBreakdown(Usage $usage, Pricing $pricing): void {
     echo "  Input:      \${$pricing->inputPerMToken}\n";
     echo "  Output:     \${$pricing->outputPerMToken}\n";
     echo "  Cache read: \${$pricing->cacheReadPerMToken}\n";
-    echo "\nTotal cost: \$" . number_format($usage->calculateCost($pricing), 6) . "\n";
+    echo "\nTotal cost: \$" . number_format($usage->cost($pricing), 6) . "\n";
 }
 
 // OPTION 1: Configure pricing in LLM config preset
@@ -86,7 +86,7 @@ printCostBreakdown($response->usage(), $pricing);
 
 // You can also attach pricing to usage for later calculation
 $usageWithPricing = $response->usage()->withPricing($pricing);
-echo "\nCost via stored pricing: \$" . number_format($usageWithPricing->calculateCost(), 6) . "\n";
+echo "\nCost via stored pricing: \$" . number_format($usageWithPricing->cost(), 6) . "\n";
 
 
 // OPTION 3: Compare costs across different models
@@ -107,7 +107,7 @@ $models = [
 echo "For {$usage->inputTokens} input + {$usage->outputTokens} output tokens:\n\n";
 foreach ($models as $model => $prices) {
     $pricing = Pricing::fromArray($prices);
-    $cost = $usage->calculateCost($pricing);
+    $cost = $usage->cost($pricing);
     printf("  %-20s \$%.6f\n", $model, $cost);
 }
 ?>

docs-build/cookbook/structured_outputs/troubleshooting/cost_calculation.mdx

@@ -35,7 +35,7 @@ $agent = AgentBuilder::base()
     ->withCapability(new UseBash())
     ->withCapability(new UseGuards(maxSteps: 10))
     ->build();
-// @doctest id="893f"
+// @doctest id="ca41"
 ```
 
 ## Package Structure
@@ -49,7 +49,7 @@ Capability/           # Use* capabilities (Core, Bash, File, Subagent, etc.)
 Collections/          # Tools, AgentSteps, StepExecutions, ErrorList, etc.
 Context/              # AgentContext, message compilers (CanCompileMessages)
 Continuation/         # StopSignal, StopReason, ExecutionContinuation
-Data/                 # AgentState, ExecutionState, AgentStep, AgentBudget
+Data/                 # AgentState, ExecutionState, AgentStep, ExecutionBudget
 Drivers/              # ToolCallingDriver, ReActDriver, FakeAgentDriver
 Enums/                # AgentStepType, ExecutionStatus
 Events/               # Agent event system
@@ -59,7 +59,7 @@ Interception/         # CanInterceptAgentLifecycle, PassThroughInterceptor
 Template/             # Agent definitions, parsers, registry
 Session/              # AgentSession, SessionRuntime, actions, repositories, stores
 Tool/                 # ToolInterface, BaseTool, FunctionTool, ToolExecutor
-// @doctest id="95b2"
+// @doctest id="3a51"
 ```
 
 ## Minimal Example
@@ -72,7 +72,7 @@ $state = AgentState::empty()->withUserMessage('Hello!');
 $result = $loop->execute($state);
 
 echo $result->finalResponse()->toString();
-// @doctest id="d635"
+// @doctest id="891e"
 ```
 
 ## Recommended Path

docs-build/packages/agents/01-introduction.mdx

@@ -19,7 +19,7 @@ $result = $loop->execute($state);
 
 echo $result->finalResponse()->toString();
 // "2 + 2 equals 4."
-// @doctest id="cbfd"
+// @doctest id="f0dd"
 ```
 
 ## What Happens
@@ -51,7 +51,7 @@ $result = $loop->execute($state);
 
 echo $result->finalResponse()->toString();
 // "The weather in Paris is 72°F and sunny."
-// @doctest id="f26d"
+// @doctest id="2f2f"
 ```
 
 ## Customizing the Loop
@@ -60,7 +60,7 @@ Add a tool to a default loop:
 
 ```php
 $loop = AgentLoop::default()->withTool($myTool);
-// @doctest id="8af7"
+// @doctest id="9c4d"
 ```
 
 Swap the driver to use ReAct reasoning:
@@ -85,7 +85,7 @@ $loop = AgentLoop::default()->withDriver(new ReActDriver(
     structuredOutput: $structuredOutput,
     model: 'gpt-4o',
 ));
-// @doctest id="baad"
+// @doctest id="1a5f"
 ```
 
 ## System Prompt
@@ -94,7 +94,7 @@ $loop = AgentLoop::default()->withDriver(new ReActDriver(
 $state = AgentState::empty()
     ->withSystemPrompt('You are a helpful assistant.')
     ->withUserMessage('Hello!');
-// @doctest id="8355"
+// @doctest id="13bf"
 ```
 
 ## Using AgentBuilder
@@ -114,7 +114,7 @@ $agent = AgentBuilder::base()
     ->build();
 
 $result = $agent->execute($state);
-// @doctest id="55b8"
+// @doctest id="0fb0"
 ```
 
 See [AgentBuilder & Capabilities](13-agent-builder.md) for details.

docs-build/packages/agents/02-basic-agent.mdx

@@ -11,7 +11,7 @@ The orchestrator. Runs a step-based loop: call LLM, execute tools, check stop co
 
 ```
 BeforeExecution -> [ BeforeStep -> UseTools -> AfterStep -> ShouldStop? ] -> AfterExecution
-// @doctest id="a1d9"
+// @doctest id="d4d4"
 ```
 
 ## AgentState
@@ -31,9 +31,8 @@ Immutable value object holding everything about an agent's session and execution
 ```php
 $state = AgentState::empty()
     ->withSystemPrompt('You are helpful.')
-    ->withUserMessage('Hello')
-    ->withBudget(new AgentBudget(maxSteps: 10));
-// @doctest id="831f"
+    ->withUserMessage('Hello');
+// @doctest id="4541"
 ```
 
 ## AgentContext
@@ -44,7 +43,7 @@ Holds the conversation data: messages, system prompt, metadata, and response for
 $state = AgentState::empty()
     ->withSystemPrompt('You are helpful.')
     ->withMetadata('user_id', 123);
-// @doctest id="8acd"
+// @doctest id="d39d"
 ```
 
 ## AgentStep
@@ -69,5 +68,5 @@ Tracks the current execution's transient state: status, completed steps, current
 $state->execution()->status();        // ExecutionStatus::InProgress
 $state->execution()->stepCount();     // 3
 $state->execution()->shouldStop();    // false
-// @doctest id="44de"
+// @doctest id="84e5"
 ```

docs-build/packages/agents/03-basic-concepts.mdx

@@ -11,7 +11,7 @@ description: 'Run agents to completion with execute() or step through with itera
 
 ```php
 $finalState = $loop->execute($state);
-// @doctest id="1089"
+// @doctest id="c390"
 ```
 
 `iterate()` yields state after each step, giving you full control:
@@ -26,7 +26,7 @@ foreach ($loop->iterate($state) as $stepState) {
         echo "  Tool: {$exec->name()} -> {$exec->value()}\n";
     }
 }
-// @doctest id="e0a9"
+// @doctest id="516a"
 ```
 
 ## Inspecting State
@@ -51,7 +51,7 @@ $toolExec = $state->lastToolExecution();
 $toolExec?->name();     // 'weather'
 $toolExec?->value();    // '72F, sunny'
 $toolExec?->hasError(); // false
-// @doctest id="14a4"
+// @doctest id="58e7"
 ```
 
 ## Reading the Agent's Response
@@ -68,7 +68,7 @@ all other cases: forced stops, errors, budget exhaustion, etc.
 ```php
 $state->hasFinalResponse();             // true only on natural completion
 $state->finalResponse()->toString();    // strict: empty when interrupted
-// @doctest id="c43e"
+// @doctest id="8619"
 ```
 
 Use `finalResponse()` when you need to distinguish between a genuine
@@ -82,7 +82,7 @@ otherwise the last step's output messages regardless of step type.
 
 ```php
 $state->currentResponse()->toString();  // pragmatic: last output text
-// @doctest id="cacf"
+// @doctest id="d3d5"
 ```
 
 Use `currentResponse()` when you want to show *something* to the user
@@ -111,7 +111,7 @@ if ($state->hasFinalResponse()) {
     echo "Agent stopped: {$reason->value}\n";
     echo $state->currentResponse()->toString();
 }
-// @doctest id="6c09"
+// @doctest id="daf7"
 ```
 
 ## Listening to Events
@@ -129,5 +129,5 @@ $loop->onEvent(AgentStepCompleted::class, function (AgentStepCompleted $event) {
 $loop->wiretap(function ($event) {
     echo get_class($event) . "\n";
 });
-// @doctest id="5d90"
+// @doctest id="4e00"
 ```

docs-build/packages/agents/04-controlling-the-loop.mdx

@@ -17,7 +17,7 @@ use Cognesy\Agents\Tool\Tools\MockTool;
 
 $calculator = MockTool::returning('calculator', 'Performs math', '42');
 $tools = new Tools($calculator);
-// @doctest id="6e0b"
+// @doctest id="eaf2"
 ```
 
 ## Using FunctionTool
@@ -34,7 +34,7 @@ function get_weather(string $city): string {
 $tool = FunctionTool::fromCallable(get_weather(...));
 
 $tools = new Tools($tool);
-// @doctest id="8c57"
+// @doctest id="f4fe"
 ```
 
 ## Multiple Tools
@@ -57,7 +57,7 @@ $tools = new Tools(
     FunctionTool::fromCallable(get_weather(...)),
     FunctionTool::fromCallable(calculate(...)),
 );
-// @doctest id="85df"
+// @doctest id="d862"
 ```
 
 ## Agent with Tools
@@ -71,7 +71,7 @@ $loop = AgentLoop::default()->withTools($tools);
 $state = AgentState::empty()->withUserMessage('What is the weather in Paris?');
 $result = $loop->execute($state);
 // LLM calls the weather tool, gets result, then responds
-// @doctest id="15a1"
+// @doctest id="9d47"
 ```
 
 ## Tool Contracts
@@ -88,7 +88,7 @@ interface ToolInterface {
     public function toToolSchema(): array;           // JSON schema sent to LLM
     public function descriptor(): CanDescribeTool;   // metadata accessor
 }
-// @doctest id="f5ff"
+// @doctest id="e79f"
 ```
 
 ### CanDescribeTool
@@ -102,7 +102,7 @@ interface CanDescribeTool {
     public function metadata(): array;       // summary for browsing/discovery
     public function instructions(): array;   // full specification with parameters
 }
-// @doctest id="6776"
+// @doctest id="7cbf"
 ```
 
 `metadata()` returns lightweight info (name, summary, namespace) for tool listings. `instructions()` returns the complete specification including parameters and return type.
@@ -127,7 +127,7 @@ class WeatherTool extends BaseTool
         return "Weather in {$city}: 72F, sunny";
     }
 }
-// @doctest id="64f8"
+// @doctest id="0b1b"
 ```
 
 See [Building Tools](06-building-tools.md) for the full guide on creating custom tools.