Merge origin/main into feat/pgpm-diff

Author: pyramation

.eslintrc.json

@@ -1,5 +1,5 @@
+import { type AssistantMessage,createUserMessage } from '@agentic-kit/chat';
 import { OpenAIAdapter } from '@agentic-kit/openai';
-import { createUserMessage, type AssistantMessage } from '@agentic-kit/chat';
 
 import { Agent } from '../src';
 

agentic/agent/__tests__/agent.live.test.ts

@@ -1,9 +1,3 @@
-import {
-  createScriptedProvider,
-  makeFakeAssistantMessage,
-  makeFakeModel,
-  ZERO_USAGE,
-} from './helpers';
 import {
   type AssistantMessage,
   type Context,
@@ -20,6 +14,12 @@ import {
   type AgentTool,
   DecisionValidationError,
 } from '../src';
+import {
+  createScriptedProvider,
+  makeFakeAssistantMessage,
+  makeFakeModel,
+  ZERO_USAGE,
+} from './helpers';
 
 describe('@agentic-kit/agent', () => {
   it('runs a minimal sequential tool loop', async () => {

agentic/agent/__tests__/agent.test.ts

@@ -1,8 +1,3 @@
-import {
-  createScriptedProvider,
-  makeFakeAssistantMessage,
-  makeFakeModel,
-} from './helpers';
 import {
   type AssistantMessageEvent,
   type Context,
@@ -12,6 +7,11 @@ import {
 } from '@agentic-kit/chat';
 
 import { Agent, type AgentEvent, type AgentTool, parseSSEStream } from '../src';
+import {
+  createScriptedProvider,
+  makeFakeAssistantMessage,
+  makeFakeModel,
+} from './helpers';
 
 describe('AgentRunHandle', () => {
   describe('events()', () => {

agentic/agent/__tests__/run-handle.test.ts

@@ -1,4 +1,3 @@
-export * from '@agentic-kit/chat';
-
 export * as agent from '@agentic-kit/agent';
+export * from '@agentic-kit/chat';
 export * as harness from '@agentic-kit/harness';

agentic/agentic-kit/src/index.ts

@@ -1,16 +1,15 @@
-import {
-  createScriptedProvider,
-  makeFakeAssistantMessage,
-  makeFakeModel,
-} from './helpers';
-
 import {
   AgentKit,
   type AssistantMessage,
   getMessageText,
   type ModelDescriptor,
   transformMessages,
 } from '../src';
+import {
+  createScriptedProvider,
+  makeFakeAssistantMessage,
+  makeFakeModel,
+} from './helpers';
 
 function createFakeModel(): ModelDescriptor {
   return makeFakeModel({ name: 'Demo' });

agentic/chat/__tests__/adapter.test.ts

@@ -1,7 +1,6 @@
-import { makeFakeAssistantMessage } from './helpers';
-
 import type { AssistantMessage, Message, ToolResultMessage } from '../src';
 import { injectDeferralResults } from '../src';
+import { makeFakeAssistantMessage } from './helpers';
 
 function assistantWithToolCall(
   id: string,

agentic/chat/__tests__/inject-deferral-results.test.ts

@@ -1,8 +1,7 @@
+import { HarnessDirs, harnessDirs, SkillsManifest } from '@agentic-kit/harness';
 import * as fs from 'fs';
 import * as path from 'path';
 
-import { harnessDirs, HarnessDirs, SkillsManifest } from '@agentic-kit/harness';
-
 export const DEFAULT_SKILLS_REPO = 'constructive-io/constructive-skills';
 export const DEFAULT_SKILLS_PIN = 'main';
 

agentic/cli/src/config.ts

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { loadConfig } from './config';
 import { init, skillsList, skillsUpdate, usage } from './commands';
+import { loadConfig } from './config';
 import { materializeDbTools } from './db-tools';
 import { assembleSkills } from './skills';
 
-export { assembleSkills } from './skills';
 export { AgentCliConfig, loadConfig } from './config';
 export { HOST_ENV_VARS, materializeDbTools } from './db-tools';
+export { assembleSkills } from './skills';
 
 async function run(args: string[]): Promise<void> {
   const config = loadConfig(process.env.AGENT_HOME);

agentic/cli/src/index.ts

@@ -1,5 +1,3 @@
-import * as path from 'path';
-
 import {
   DirectorySkillSource,
   fetchSkillsFromGit,
@@ -9,6 +7,7 @@ import {
   resolveSkills,
   SkillSource
 } from '@agentic-kit/harness';
+import * as path from 'path';
 
 import { AgentCliConfig, BASE_LAYER, OVERLAY_LAYER } from './config';