Refactor the project

Author: habedi

.github/workflows/lints.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
+          node-version: "22.x"
       - name: Install Dependencies
         run: make install
       - name: Run linter
@@ -37,8 +37,8 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: "20.x"
+          node-version: "22.x"
       - name: Install Dependencies
         run: make install
-      - name: Run type checks
+      - name: Run Typechecking Checks
         run: make typecheck

.github/workflows/publish.yml

@@ -26,7 +26,7 @@ jobs:
       contents: read
 
     steps:
-      - name: Checkout repository
+      - name: Checkout Repository
         uses: actions/checkout@v4
 
       - name: Use Node.js
@@ -36,31 +36,31 @@ jobs:
           registry-url: "https://registry.npmjs.org"
           cache: "npm"
 
-      - name: Show Node and npm versions
+      - name: Show Node and npm Versions
         run: |
           node -v
           npm -v
 
       - name: Install dependencies
         run: npm install --legacy-peer-deps
 
-      - name: Run tests
+      - name: Run Tests
         run: npm test
 
-      - name: Build package
+      - name: Build Package
         run: npm run build
 
-      - name: Verify package contents
+      - name: Verify Package Content
         run: npm pack --dry-run
 
-      - name: Publish to npm
+      - name: Publish to `npm`
         if: >-
           (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) ||
           (github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'false')
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: npm publish --access public
 
-      - name: Dry-run publish
+      - name: Dry-run Publish
         if: github.event_name == 'workflow_dispatch' && github.event.inputs.dry_run == 'true'
         run: npm publish --access public --dry-run

.github/workflows/tests.yml

@@ -35,7 +35,8 @@ jobs:
       - name: Run Tests with Coverage
         run: make coverage
 
-      - name: Upload coverage reports to Codecov
+      - name: Upload Coverage Reports to Codecov
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false

.gitignore

@@ -166,3 +166,5 @@ BINHARIC.md
 AGENT.md
 *.tar.gz
 *.tgz
+test.txt
+a.out

Makefile

@@ -37,34 +37,34 @@ help: ## Show this help message
 	awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[36m%-18s\033[0m %s\n", $$1, $$2}'
 
 install: ## Install project dependencies
-	$(PACKAGE_MANAGER) install --legacy-peer-deps
+	@$(PACKAGE_MANAGER) install --legacy-peer-deps
 
 build: check-deps ## Build Binharic
-	$(PACKAGE_MANAGER) run build
+	@$(PACKAGE_MANAGER) run build
 
 run: build ## Start Binharic in terminal
-	$(PACKAGE_MANAGER) start
+	@$(PACKAGE_MANAGER) start
 
 clean: ## Remove build artifacts
-	rm -rf dist $(NODE_MODULES_DIR) $(REMOVABLE_THINGS)
+	@rm -rf dist $(NODE_MODULES_DIR) $(REMOVABLE_THINGS)
 
 # ==============================================================================
 # DEVELOPMENT
 # ==============================================================================
 test: check-deps ## Run the test suite
-	$(PACKAGE_MANAGER) test
+	@$(PACKAGE_MANAGER) test
 
 coverage: check-deps ## Run the test suite and generate a coverage report
-	$(PACKAGE_MANAGER) run coverage
+	@$(PACKAGE_MANAGER) run coverage
 
 lint: check-deps ## Run linter checks
-	$(PACKAGE_MANAGER) run lint
+	@$(PACKAGE_MANAGER) run lint
 
 typecheck: check-deps ## Run TypeScript type checks
-	$(PACKAGE_MANAGER) run typecheck
+	@$(PACKAGE_MANAGER) run typecheck
 
 format: check-deps ## Format code with Prettier
-	$(PACKAGE_MANAGER) run format
+	@$(PACKAGE_MANAGER) run format
 
 # ==============================================================================
 # GIT HOOKS
@@ -87,28 +87,28 @@ test-hooks: ## Test Git hooks on all files
 # PUBLISHING
 # ==============================================================================
 npm-login: ## Log in to npm registry
-	$(PACKAGE_MANAGER) login
+	@$(PACKAGE_MANAGER) login
 
 npm-whoami: ## Show current npm user (if logged in)
-	-$(PACKAGE_MANAGER) whoami
+	@-$(PACKAGE_MANAGER) whoami
 
 pack: build ## Create npm tarball (binharic-cli-<version>.tgz)
-	$(PACKAGE_MANAGER) pack
+	@$(PACKAGE_MANAGER) pack
 
 pack-dry-run: build ## Preview files that would be packed
-	$(PACKAGE_MANAGER) pack --dry-run
+	@$(PACKAGE_MANAGER) pack --dry-run
 
 publish-dry-run: ## Simulate npm publish (no registry changes)
-	$(PACKAGE_MANAGER) publish --dry-run
+	@$(PACKAGE_MANAGER) publish --access public --dry-run
 
 publish: ## Publish the package to npm (runs build via prepublishOnly)
-	$(PACKAGE_MANAGER) publish
+	@$(PACKAGE_MANAGER) publish --access public
 
 version-patch: ## Bump patch version (x.y.z -> x.y.(z+1))
-	$(PACKAGE_MANAGER) version patch
+	@$(PACKAGE_MANAGER) version patch
 
 version-minor: ## Bump minor version (x.y.z -> x.(y+1).0)
-	$(PACKAGE_MANAGER) version minor
+	@$(PACKAGE_MANAGER) version minor
 
 version-major: ## Bump major version ((x+1).0.0)
-	$(PACKAGE_MANAGER) version major
+	@$(PACKAGE_MANAGER) version major

README.md

@@ -9,7 +9,7 @@
 [![Tests](https://img.shields.io/github/actions/workflow/status/CogitatorTech/binharic-cli/tests.yml?label=tests&style=flat&labelColor=333333&logo=github&logoColor=white)](https://github.com/CogitatorTech/binharic-cli/actions/workflows/tests.yml)
 [![Code Coverage](https://img.shields.io/codecov/c/github/CogitatorTech/binharic-cli?style=flat&label=coverage&labelColor=333333&logo=codecov&logoColor=white)](https://codecov.io/gh/CogitatorTech/binharic-cli)
 [![Code Quality](https://img.shields.io/codefactor/grade/github/CogitatorTech/binharic-cli?style=flat&label=code%20quality&labelColor=333333&logo=codefactor&logoColor=white)](https://www.codefactor.io/repository/github/CogitatorTech/binharic-cli)
-[![npm](https://img.shields.io/npm/v/binharic-cli?style=flat&labelColor=333333&logo=npm&logoColor=white)](https://www.npmjs.com/package/binharic-cli)
+[![npm](https://img.shields.io/npm/v/%40cogitator%2Fbinharic-cli?style=flat&labelColor=333333&logo=npm&logoColor=white)](https://www.npmjs.com/package/@cogitator/binharic-cli)
 [![Documentation](https://img.shields.io/badge/docs-latest-8ca0d7?style=flat&labelColor=333333&logo=read-the-docs&logoColor=white)](docs)
 [![License](https://img.shields.io/badge/license-MIT-00acc1?style=flat&labelColor=333333&logo=open-source-initiative&logoColor=white)](LICENSE)
 

ROADMAP.md

@@ -19,19 +19,19 @@ It includes planned features, improvements, and their current implementation sta
     - [x] Token-based context window management
     - [x] Automatic context trimming for long conversations
     - [x] History preservation across sessions
-    - [x] Adaptive context management with prepareStep callbacks
+    - [ ] Adaptive context management with prepareStep callbacks
     - [x] Tool result summarization for longer agentic loops
     - [ ] Intelligent context compression
     - [ ] Semantic context pruning
 - **Multi-Step Execution**
     - [x] Multi-step tool calling with retry logic
     - [x] Transient error handling with exponential backoff
     - [x] Tool execution confirmation flow
-    - [x] AI SDK 5 Agent class integration
-    - [x] Automatic loop control with stopWhen conditions**
-    - [x] Budget-based stopping conditions
+    - [ ] AI SDK 5 Agent class integration (currently using AI SDK streaming + tool calling directly)
+    - [ ] Automatic loop control with stopWhen conditions
+    - [ ] Budget-based stopping conditions
     - [x] Error threshold conditions
-    - [x] Validation-based stopping
+    - [ ] Validation-based stopping
     - [x] Completion detection conditions
     - [ ] Parallel tool execution for independent operations
     - [ ] Automatic tool dependency resolution
@@ -54,11 +54,11 @@ It includes planned features, improvements, and their current implementation sta
     - [x] Smart file editing with diff application
     - [x] List directory contents
     - [x] File search capabilities
-    - [x] Integrated with AI SDK Agent class
+    - [x] Integrated with AI SDK tool calling
     - [x] Automatic file tracking for edits (no manual read required)
     - [x] File staleness detection
     - [x] Memory-efficient file tracking (1000 file limit)
-    - [ ] File comparison and diffing
+    - [x] File comparison and diffing
     - [ ] Bulk file operations
     - [ ] File watching for changes
 - **Code Intelligence**
@@ -78,7 +78,7 @@ It includes planned features, improvements, and their current implementation sta
     - [ ] Interactive shell support
     - [ ] Command history and replay
     - [ ] Environment variable management
-- **Web & Network**
+- **Web and Network**
     - [x] URL fetching with HTML-to-text conversion
     - [x] Content markup stripping
     - [ ] API integration templates
@@ -103,7 +103,7 @@ It includes planned features, improvements, and their current implementation sta
     - [x] File search with @ mention
     - [x] Non-blocking UI during LLM responses
     - [x] Command syntax highlighting (partial match in yellow, full match in cyan)
-    - [x] Colored help menu items**
+    - [x] Colored help menu items\*\*
     - [x] Clean message display (no "Binharic:" prefix)
     - [x] Dynamic username from system (not hardcoded)
     - [x] Tool results hidden from UI (only failures shown)
@@ -122,7 +122,7 @@ It includes planned features, improvements, and their current implementation sta
     - [ ] Undo/redo for file operations
     - [ ] Session saving and loading
 
-### 4. Configuration & Customization
+### 4. Configuration and Customization
 
 - **Configuration Management**
     - [x] JSON5 configuration format
@@ -131,16 +131,16 @@ It includes planned features, improvements, and their current implementation sta
     - [x] API key management
     - [x] History size limits
     - [ ] Configuration profiles (development, production, etc.)
-    - [ ] Configuration validation with detailed error messages
+    - [x] Configuration validation with detailed error messages
     - [ ] Hot-reload configuration changes
-- **Personality & Behavior**
+- **Personality and Behavior**
     - [x] Adeptus Mechanicus character and terminology
     - [x] Customizable system prompts
     - [ ] Multiple personality presets
     - [ ] Conversation style customization
     - [ ] Output verbosity levels
 
-### 5. Performance & Reliability
+### 5. Performance and Reliability
 
 - **Error Handling**
     - [x] Categorized errors (Fatal, Transient, Tool)
@@ -173,7 +173,7 @@ It includes planned features, improvements, and their current implementation sta
     - [ ] Usage analytics (tokens, costs)
     - [ ] Health checks and diagnostics
 
-### 6. Testing & Quality
+### 6. Testing and Quality
 
 - **Test Coverage**
     - [x] Unit tests for core functionality
@@ -213,7 +213,7 @@ It includes planned features, improvements, and their current implementation sta
     - [ ] Plugin development guide
     - [ ] Deployment guide
 
-### 8. Distribution & Deployment
+### 8. Distribution and Deployment
 
 - **Package Management**
     - [x] NPM package structure
@@ -227,7 +227,7 @@ It includes planned features, improvements, and their current implementation sta
     - [ ] Chocolatey package (Windows)
     - [ ] Docker image
     - [ ] Standalone binary releases
-- **Cloud & Remote**
+- **Cloud and Remote**
     - [ ] Remote execution support
     - [ ] Multi-user deployments
     - [ ] Cloud provider integrations
@@ -238,12 +238,12 @@ It includes planned features, improvements, and their current implementation sta
     - [x] Autonomous task execution
     - [x] Tool chaining
     - [x] File tracking for safe edits
-    - [x] AI SDK 5 Agent class for reusable configurations
+    - [ ] AI SDK 5 Agent class for reusable configurations
     - [x] Multi-step tool execution with automatic loop control
     - [x] Specialized agents with distinct personalities
-    - [x] onStepFinish callbacks for monitoring
-    - [x] prepareStep callbacks for dynamic configuration**
-    - [x] Multiple stopping conditions (step count, budget, errors, validation, completion)
+    - [ ] onStepFinish callbacks for monitoring
+    - [ ] prepareStep callbacks for dynamic configuration\*\*
+    - [ ] Multiple stopping conditions (step count, budget, errors, validation, completion)
     - [ ] Goal-oriented planning
     - [ ] Task decomposition
     - [ ] Long-term memory
@@ -255,14 +255,14 @@ It includes planned features, improvements, and their current implementation sta
     - [ ] Code review assistance
     - [ ] Pull request analysis
     - [ ] Multi-agent collaboration
-- **Extensions & Plugins**
+- **Extensions and Plugins**
     - [ ] Plugin system architecture
     - [ ] Custom tool registration
     - [ ] Language-specific plugins
     - [ ] Framework-specific assistants
     - [ ] Custom agent templates
 
-### 10. Security & Privacy
+### 10. Security and Privacy
 
 - **Security**
     - [x] API key environment variable support

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "binharic-cli",
+  "name": "@cogitator/binharic-cli",
   "version": "0.1.0-alpha.1",
   "description": "A coding agent with the persona of a Tech-Priest of the Adeptus Mechanicus",
   "main": "dist/cli.js",
@@ -13,6 +13,9 @@
     "README.md",
     "LICENSE"
   ],
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "start": "node dist/cli.js",
     "dev": "nodemon",
@@ -28,10 +31,13 @@
   },
   "keywords": [
     "ai",
+    "coding-agent",
+    "ai-assistant",
     "typescript",
-    "cli"
+    "cli",
+    "llm"
   ],
-  "author": "",
+  "author": "Hassan Abedi",
   "license": "MIT",
   "dependencies": {
     "@ai-sdk/anthropic": "^2.0.4",

src/agent/contextWindow.ts src/agent/context/contextWindow.tssrc/agent/contextWindow.ts renamed to src/agent/context/contextWindow.ts

@@ -37,6 +37,7 @@ function getMessageTokenCount(message: ModelMessage): number {
                 }
             } else if ("toolName" in part && typeof part.toolName === "string") {
                 tokens += getTokenCount(part.toolName);
+                tokens += 10;
                 if ("args" in part && part.args) {
                     tokens += getTokenCount(serializeContent(part.args));
                 }
@@ -50,6 +51,10 @@ function getMessageTokenCount(message: ModelMessage): number {
 
     tokens += 4;
 
+    if (message.role === "tool") {
+        tokens += 15;
+    }
+
     return tokens;
 }
 

src/agent/history.ts src/agent/context/history.tssrc/agent/history.ts renamed to src/agent/context/history.ts

@@ -1,5 +1,5 @@
 import type { AssistantContent } from "ai";
-import type { ToolCall } from "./types.js";
+import type { ToolCall } from "../core/types.js";
 
 export type UserMessageItem = {
     id: string;