agentic-orchestrator 0.1.0 → 0.1.2

package/.dockerignore

@@ -20,5 +20,4 @@ prompts
 
 # Local/editor artifacts
 *.iml
-*.log
 .DS_Store

package/README.md

@@ -231,8 +231,8 @@ Behavior:
   - `feature_id` is derived from file stem (strips `.spec` or `-spec` suffixes when present).
   - each ingested feature runs `feature.init`, then state source metadata is patched with source path/hash.
 - Provider selection precedence:
-  1. CLI flags (`--agent-provider`, `--agent-model`, `--provider-config-env`)
-  2. env vars (`AOP_AGENT_PROVIDER`, `AOP_AGENT_MODEL`, `AOP_PROVIDER_CONFIG_ENV`)
+  1. CLI flags (`--agent-provider`, `--agent-model`, `--agent-config`, `--provider-config-env`)
+  2. env vars (`AOP_AGENT_PROVIDER`, `AOP_AGENT_MODEL`, `AOP_AGENT_CONFIG`/`AOP_AGENT_CONFIG_JSON`, `AOP_PROVIDER_CONFIG_ENV`)
   3. `agentic/orchestrator/agents.yaml` runtime defaults
 - Runtime start:
   - starts `SupervisorRuntime` with `max_active_features=5`, `max_parallel_gate_runs=3`.
@@ -355,8 +355,9 @@ Supported options:
 |-------------------------------------------------------|-----------------------------------------------------------------------------------|
 | `-fi <path>`                                          | Run exactly one spec file                                                         |
 | `-fl <path>`                                          | Resolve all `**/*.md` files recursively in a folder (deterministic lexical order) |
-| `--agent-provider <codex\\|claude\\|gemini\\|custom>` | Provider selection                                                                |
+| `--agent-provider <codex\\|claude\\|gemini\\|custom\\|kiro-cli\\|copilot>` | Provider selection                                                 |
 | `--agent-model <model-id>`                            | Model selection                                                                   |
+| `--agent-config <json-object>`                        | Additional provider-specific agent config (for example command/args payload)      |
 | `--provider-config-env <ENV_VAR>`                     | Provider auth/config environment variable name                                    |
 | `--transport <mcp\\|inprocess>`                       | Tool transport selection (default `mcp`)                                          |
 | `--takeover-stale-run`                                | Allow stale run-lease takeover during `run`                                       |
@@ -386,7 +387,7 @@ Feature ID derivation for non-canonical inputs:
 Provider resolution precedence:
 
 1. CLI flags
-2. env vars (`AOP_AGENT_PROVIDER`, `AOP_AGENT_MODEL`, `AOP_PROVIDER_CONFIG_ENV`)
+2. env vars (`AOP_AGENT_PROVIDER`, `AOP_AGENT_MODEL`, `AOP_AGENT_CONFIG`/`AOP_AGENT_CONFIG_JSON`, `AOP_PROVIDER_CONFIG_ENV`)
 3. `agentic/orchestrator/agents.yaml` runtime defaults
 
 Transport behavior:
@@ -430,6 +431,7 @@ Coverage parser:
 
 - role-specific system prompt paths
 - default provider/model/config-env fallback values
+- optional `runtime.provider_configs.<provider>` objects for provider-specific payloads (for example `kiro-cli chat --agent dev`)
 - stack-specific examples: [`example-configurations/node/`](example-configurations/node) and [`example-configurations/java/`](example-configurations/java)
 
 ### Example configuration bundles

package/agentic/orchestrator/agents.yaml

@@ -11,4 +11,14 @@ runtime:
   default_provider: custom
   default_model: local-default
   provider_config_env: AOP_PROVIDER_CONFIG_ENV
+  provider_configs:
+    kiro-cli:
+      command: kiro-cli
+      args:
+        - chat
+        - --agent
+        - dev
+    copilot:
+      command: copilot
+      args: []
   role_provider_overrides: {}

package/agentic/orchestrator/schemas/agents.schema.json

@@ -25,10 +25,19 @@
       "properties": {
         "default_provider": {
           "type": "string",
-          "enum": ["codex", "claude", "gemini", "custom"]
+          "enum": ["codex", "claude", "gemini", "custom", "kiro-cli", "copilot"]
         },
         "default_model": { "type": "string" },
+        "default_agent_config": {
+          "type": "object"
+        },
         "provider_config_env": { "type": "string" },
+        "provider_configs": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "object"
+          }
+        },
         "role_provider_overrides": {
           "type": "object"
         }

package/apps/control-plane/scripts/validate-docker-mcp-contract.mjs

@@ -37,7 +37,7 @@ assertContains(dockerfile, /apt-get install[^]*\bgit\b/m, 'docker image must inc
 assertContains(dockerfile, /ENV\s+AOP_REPO_ROOT=\/repo/m, 'docker image must declare /repo root');
 assertContains(
   dockerfile,
-  /ENTRYPOINT\s+\["\/bin\/sh",\s*"\/app\/docker\/mcp\.entrypoint\.sh"\]/m,
+  /ENTRYPOINT\s+\["\/bin\/sh",\s*"\/app\/docker\/mcp\.entrypoint\.sh"]/m,
   'docker entrypoint must enforce runtime preflight checks'
 );
 
@@ -45,7 +45,7 @@ assertContains(compose, /aop-mcp:/m, 'compose must declare aop-mcp service');
 assertContains(compose, /- \.\.\/:\/repo/m, 'compose must bind-mount repository to /repo');
 assertContains(compose, /working_dir:\s*\/repo/m, 'compose service must execute from /repo');
 
-assertContains(entrypoint, /if \[ ! -d "\/repo" \]/m, 'entrypoint must enforce /repo mount check');
+assertContains(entrypoint, /if \[ ! -d "\/repo" ]/m, 'entrypoint must enforce /repo mount check');
 assertContains(entrypoint, /for tool in node npm npx git;/m, 'entrypoint must verify required toolchains');
 
 if (!runSmoke) {

package/apps/control-plane/src/application/services/feature-deletion-service.ts

@@ -293,7 +293,7 @@ export class FeatureDeletionService {
     const indexUpdate = await this.port.withIndexLock(async () => {
       const index = await this.port.readIndex();
       let changed = false;
-      let blockedQueueRemoved = 0;
+      let blockedQueueRemoved: number;
       let runtimeSessionRemoved = false;
 
       const active = asStringArray(index.active);

package/apps/control-plane/src/cli/cli-argument-parser.ts

@@ -79,6 +79,11 @@ export class CliArgumentParser {
         index += 1;
         continue;
       }
+      if (token === '--agent-config') {
+        options.agent_config = next;
+        index += 1;
+        continue;
+      }
       if (token === '--provider-config-env') {
         options.provider_config_env = next;
         index += 1;

package/apps/control-plane/src/cli/resume-command-handler.ts

@@ -189,7 +189,6 @@ export class ResumeCommandHandler {
           sources: [...(sourcesByFeature.get(featureId) ?? new Set<string>())].sort((a, b) => a.localeCompare(b))
         });
       } catch (_error) {
-        continue;
       }
     }
 

package/apps/control-plane/src/cli/types.ts

@@ -9,6 +9,7 @@ export interface CliOptions {
   remove_branch?: string;
   agent_provider?: string;
   agent_model?: string;
+  agent_config?: string;
   provider_config_env?: string;
   transport?: string;
   takeover_stale_run?: boolean;

package/apps/control-plane/src/core/kernel.ts

@@ -41,6 +41,8 @@ export interface AgentsRuntimeConfig {
   default_provider?: string;
   default_model?: string;
   provider_config_env?: string;
+  default_agent_config?: Record<string, unknown>;
+  provider_configs?: Record<string, Record<string, unknown>>;
 }
 
 export interface AgentsConfigSnapshot {
@@ -376,12 +378,12 @@ export class AopKernel {
       return fail(ERROR_CODES.INTERNAL_ERROR, 'Unknown error');
     }
 
-    if (typeof error === 'object' && error !== null && 'normalizedResponse' in error) {
+    if (typeof error === 'object' && 'normalizedResponse' in error) {
       return (error as { normalizedResponse: ToolResponse }).normalizedResponse;
     }
 
     const message =
-      typeof error === 'object' && error !== null && 'message' in error
+      typeof error === 'object' && true && 'message' in error
         ? (error as { message?: unknown }).message
         : undefined;
     const text = String(message ?? error);

package/apps/control-plane/src/providers/providers.ts

@@ -7,10 +7,11 @@ export interface AppError extends Error {
 }
 
 export interface ProviderSelection {
-  provider: 'codex' | 'claude' | 'gemini' | 'custom';
+  provider: 'codex' | 'claude' | 'gemini' | 'custom' | 'kiro-cli' | 'copilot';
   model: string;
   provider_config_env: string | null;
   provider_config_ref: string | null;
+  agent_config?: Record<string, unknown> | null;
 }
 
 interface ResolveSelectionInput {
@@ -21,11 +22,78 @@ interface ResolveSelectionInput {
       default_provider?: string;
       default_model?: string;
       provider_config_env?: string;
+      default_agent_config?: unknown;
+      provider_configs?: Record<string, unknown>;
     };
   };
 }
 
-export const SUPPORTED_PROVIDERS = new Set<ProviderSelection['provider']>(['codex', 'claude', 'gemini', 'custom']);
+type ResolveSelectionRuntimeConfig = NonNullable<ResolveSelectionInput['agentsConfig']>['runtime'];
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function invalidAgentConfigError(details: Record<string, unknown>): AppError {
+  const error = new Error(ERROR_CODES.INVALID_CLI_ARGS) as AppError;
+  error.code = ERROR_CODES.INVALID_CLI_ARGS;
+  error.details = details;
+  return error;
+}
+
+function parseAgentConfigJson(raw: string, source: 'cli' | 'env'): Record<string, unknown> {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    throw invalidAgentConfigError({
+      reason: 'Invalid agent config JSON',
+      source,
+      value: raw,
+      parse_error: error instanceof Error ? error.message : String(error)
+    });
+  }
+
+  if (!isPlainObject(parsed)) {
+    throw invalidAgentConfigError({
+      reason: 'Agent config JSON must be an object',
+      source,
+      value: raw
+    });
+  }
+
+  return parsed;
+}
+
+function resolveConfiguredAgentConfig(
+  provider: string,
+  runtime: ResolveSelectionRuntimeConfig
+): Record<string, unknown> | null {
+  if (!runtime) {
+    return null;
+  }
+
+  const providerSpecific = runtime.provider_configs?.[provider];
+  if (isPlainObject(providerSpecific)) {
+    return providerSpecific;
+  }
+
+  if (isPlainObject(runtime.default_agent_config)) {
+    return runtime.default_agent_config;
+  }
+
+  return null;
+}
+
+export const SUPPORTED_PROVIDERS = new Set<ProviderSelection['provider']>([
+  'codex',
+  'claude',
+  'gemini',
+  'custom',
+  'kiro-cli',
+  'copilot'
+]);
+export const AUTH_REQUIRED_PROVIDERS = new Set<ProviderSelection['provider']>(['codex', 'claude', 'gemini']);
 export type ProviderSelectionResolver = (input: ResolveSelectionInput) => ProviderSelection;
 
 export const resolveProviderSelection: ProviderSelectionResolver = ({ cli, env, agentsConfig }) => {
@@ -60,7 +128,10 @@ export const resolveProviderSelection: ProviderSelectionResolver = ({ cli, env,
     throw error;
   }
 
-  if (provider !== 'custom' && (!providerConfigEnv || !env[providerConfigEnv])) {
+  if (
+    AUTH_REQUIRED_PROVIDERS.has(provider as ProviderSelection['provider']) &&
+    (!providerConfigEnv || !env[providerConfigEnv])
+  ) {
     const error = new Error(ERROR_CODES.PROVIDER_AUTH_MISSING) as AppError;
     error.code = ERROR_CODES.PROVIDER_AUTH_MISSING;
     error.details = {
@@ -70,11 +141,21 @@ export const resolveProviderSelection: ProviderSelectionResolver = ({ cli, env,
     throw error;
   }
 
+  const agentConfig =
+    typeof cli.agent_config === 'string' && cli.agent_config.length > 0
+      ? parseAgentConfigJson(cli.agent_config, 'cli')
+      : typeof env.AOP_AGENT_CONFIG === 'string' && env.AOP_AGENT_CONFIG.length > 0
+        ? parseAgentConfigJson(env.AOP_AGENT_CONFIG, 'env')
+        : typeof env.AOP_AGENT_CONFIG_JSON === 'string' && env.AOP_AGENT_CONFIG_JSON.length > 0
+          ? parseAgentConfigJson(env.AOP_AGENT_CONFIG_JSON, 'env')
+          : resolveConfiguredAgentConfig(provider, agentsConfig?.runtime);
+
   return {
     provider: provider as ProviderSelection['provider'],
     model: model ?? `${provider}-default`,
     provider_config_env: providerConfigEnv,
-    provider_config_ref: providerConfigEnv ? env[providerConfigEnv] ?? null : null
+    provider_config_ref: providerConfigEnv ? env[providerConfigEnv] ?? null : null,
+    agent_config: agentConfig
   };
 };
 

package/apps/control-plane/test/cli-helpers.spec.ts

@@ -18,6 +18,8 @@ describe('cli helper modules', () => {
       'run',
       '--agent-model',
       'gpt-5',
+      '--agent-config',
+      '{"command":"kiro-cli","args":["chat","--agent","dev"]}',
       '--provider-config-env',
       'AOP_PROVIDER_CFG',
       '--transport',
@@ -27,6 +29,7 @@ describe('cli helper modules', () => {
     expect(parsed).toMatchObject({
       command: 'run',
       agent_model: 'gpt-5',
+      agent_config: '{"command":"kiro-cli","args":["chat","--agent","dev"]}',
       provider_config_env: 'AOP_PROVIDER_CFG',
       transport: 'mcp'
     });

package/apps/control-plane/test/providers.spec.ts

@@ -87,6 +87,84 @@ describe('provider selection', () => {
     expect(selection.provider).toBe('custom');
     expect(selection.provider_config_ref).toBeNull();
   });
+
+  it('GIVEN_kiro_cli_provider_without_credentials_WHEN_resolving_THEN_allows_null_config_ref', () => {
+    const selection = resolveProviderSelection({
+      cli: {
+        agent_provider: 'kiro-cli'
+      },
+      env: {},
+      agentsConfig: {}
+    });
+
+    expect(selection.provider).toBe('kiro-cli');
+    expect(selection.provider_config_ref).toBeNull();
+  });
+
+  it('GIVEN_provider_configured_agent_config_WHEN_resolving_THEN_returns_provider_specific_config', () => {
+    const selection = resolveProviderSelection({
+      cli: {
+        agent_provider: 'kiro-cli'
+      },
+      env: {},
+      agentsConfig: {
+        runtime: {
+          provider_configs: {
+            'kiro-cli': {
+              command: 'kiro-cli',
+              args: ['chat', '--agent', 'dev']
+            }
+          }
+        }
+      }
+    });
+
+    expect(selection.agent_config).toEqual({
+      command: 'kiro-cli',
+      args: ['chat', '--agent', 'dev']
+    });
+  });
+
+  it('GIVEN_cli_agent_config_WHEN_resolving_THEN_cli_agent_config_overrides_runtime_defaults', () => {
+    const selection = resolveProviderSelection({
+      cli: {
+        agent_provider: 'copilot',
+        agent_config: JSON.stringify({
+          command: 'copilot',
+          args: ['chat', '--agent', 'review']
+        })
+      },
+      env: {},
+      agentsConfig: {
+        runtime: {
+          provider_configs: {
+            copilot: {
+              command: 'copilot',
+              args: ['chat']
+            }
+          }
+        }
+      }
+    });
+
+    expect(selection.agent_config).toEqual({
+      command: 'copilot',
+      args: ['chat', '--agent', 'review']
+    });
+  });
+
+  it('GIVEN_invalid_cli_agent_config_json_WHEN_resolving_THEN_throws_invalid_cli_args', () => {
+    expect(() =>
+      resolveProviderSelection({
+        cli: {
+          agent_provider: 'kiro-cli',
+          agent_config: '{not-json'
+        },
+        env: {},
+        agentsConfig: {}
+      })
+    ).toThrow(ERROR_CODES.INVALID_CLI_ARGS);
+  });
 });
 
 describe('NullWorkerProvider', () => {

package/example-configurations/README.md

@@ -24,3 +24,5 @@ Important:
 - For Java projects, use the Java `gates.yaml` Maven commands (`./mvnw ...`) and `jacoco_xml` parser.
 - `policy.yaml -> supervisor.max_iterations_per_phase` controls planner/builder/qa loop reconciliation iterations (default `6`).
 - `policy.yaml -> rbac.orchestrator` includes `feature.delete` for the delete command path.
+- `agents.yaml -> runtime.default_provider` supports `kiro-cli` and `copilot` in addition to existing providers.
+- `agents.yaml -> runtime.provider_configs.<provider>` can hold provider-specific command payloads (for example `command: kiro-cli`, `args: [chat, --agent, dev]`).

package/example-configurations/java/agents.yaml

@@ -11,4 +11,14 @@ runtime:
   default_provider: custom
   default_model: java-default
   provider_config_env: JAVA_PROVIDER_CONFIG_ENV
+  provider_configs:
+    kiro-cli:
+      command: kiro-cli
+      args:
+        - chat
+        - --agent
+        - dev
+    copilot:
+      command: copilot
+      args: []
   role_provider_overrides: {}

package/example-configurations/node/agents.yaml

@@ -11,4 +11,14 @@ runtime:
   default_provider: custom
   default_model: node-default
   provider_config_env: NODE_PROVIDER_CONFIG_ENV
+  provider_configs:
+    kiro-cli:
+      command: kiro-cli
+      args:
+        - chat
+        - --agent
+        - dev
+    copilot:
+      command: copilot
+      args: []
   role_provider_overrides: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentic-orchestrator",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": false,
   "type": "module",
   "description": "MCP-first, platform-agnostic multi-agent orchestrator control plane",