refactor: restructure to plugin/ + services/ layout and add per-turn bootstrap injection

- Migrate src/ → plugin/ (plugin/core/, plugin/web/, plugin/commands/)
  and src/mcp/ → services/ per OpenClaw plugin dev spec
- Add Gemini CLI backend (plugin/core/gemini/sdk-adapter.ts) with GEMINI.md
  system-prompt injection
- Inject bootstrap as stateless system prompt on every turn instead of
  first turn only: Claude via --system-prompt, Gemini via workspace/GEMINI.md;
  eliminates isFirstTurn branch, keeps skills in sync with OpenClaw snapshots
- Fix session-map-store defensive parsing (sessions ?? []) to handle bare {}
  reset files without crashing on .find()
- Add docs/TEST_FLOW.md with E2E test scenarios and expected outcomes
- Add docs/claude/BRIDGE_MODEL_FINDINGS.md with contractor-probe results

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
h z
2026-04-11 21:21:32 +01:00
parent eee62efbf1
commit 07a0f06e2e
30 changed files with 1239 additions and 172 deletions

View File

@@ -0,0 +1,53 @@
import fs from "node:fs";
import { createBaseAgent } from "../core/openclaw/agents-add-runner.js";
import { markAgentAsClaudeContractor, markAgentAsGeminiContractor } from "../core/openclaw/agent-config-writer.js";
import { ensureContractorStateDir } from "../core/contractor/runtime-state.js";
import { initEmptySessionMap } from "../core/contractor/session-map-store.js";
export type AddArgs = {
agentId: string;
workspace: string;
contractor: string;
};
export async function runContractorAgentsAdd(args: AddArgs): Promise<void> {
const { agentId, workspace, contractor } = args;
// Validate
if (!agentId) throw new Error("--agent-id is required");
if (!workspace) throw new Error("--workspace is required");
if (!contractor) throw new Error("--contractor is required");
if (contractor !== "claude" && contractor !== "gemini") {
throw new Error(`--contractor ${contractor}: must be 'claude' or 'gemini'`);
}
const bridgeModel =
contractor === "gemini"
? "contractor-agent/contractor-gemini-bridge"
: "contractor-agent/contractor-claude-bridge";
// Ensure workspace exists
if (!fs.existsSync(workspace)) {
fs.mkdirSync(workspace, { recursive: true });
}
console.log(`[contractor-agent] Creating base OpenClaw agent: ${agentId}`);
createBaseAgent({ agentId, workspace, bridgeModel });
console.log(`[contractor-agent] Writing contractor metadata`);
if (contractor === "gemini") {
markAgentAsGeminiContractor(agentId, workspace);
} else {
markAgentAsClaudeContractor(agentId, workspace);
}
console.log(`[contractor-agent] Initializing runtime state`);
ensureContractorStateDir(workspace);
initEmptySessionMap(workspace);
console.log(`[contractor-agent] Done.`);
console.log(` Agent: ${agentId}`);
console.log(` Workspace: ${workspace}`);
console.log(` Model: ${bridgeModel}`);
console.log(` State dir: ${workspace}/.openclaw/contractor-agent/`);
}

View File

@@ -0,0 +1,50 @@
import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
import { runContractorAgentsAdd } from "./contractor-agents-add.js";
export function registerCli(api: OpenClawPluginApi): void {
api.registerCli(
(ctx) => {
// Use ctx.program.command() directly — do NOT import Commander separately.
// Importing a different Commander version causes _prepareForParse failures.
const contractorAgents = ctx.program.command("contractor-agents")
.description("Manage Claude-backed contractor agents");
contractorAgents
.command("add")
.description("Provision a new Claude-backed contractor agent")
.requiredOption("--agent-id <id>", "Agent id")
.requiredOption("--workspace <path>", "Workspace directory")
.requiredOption("--contractor <kind>", "Contractor kind (claude)")
.action(async (opts: { agentId: string; workspace: string; contractor: string }) => {
try {
await runContractorAgentsAdd({
agentId: opts.agentId,
workspace: opts.workspace,
contractor: opts.contractor,
});
} catch (err) {
console.error(`[contractor-agents add] Error: ${String(err)}`);
process.exitCode = 1;
}
});
contractorAgents
.command("status")
.description("Show status of a contractor agent (not yet implemented)")
.requiredOption("--agent-id <id>", "Agent id")
.action(() => {
console.log("[contractor-agents status] not yet implemented");
});
},
{
commands: ["contractor-agents"],
descriptors: [
{
name: "contractor-agents",
description: "Manage Claude-backed contractor agents",
hasSubcommands: true,
},
],
},
);
}