* Agents: add subagent orchestration controls
* Agents: add subagent orchestration controls (WIP uncommitted changes)
* feat(subagents): add depth-based spawn gating for sub-sub-agents
* feat(subagents): tool policy, registry, and announce chain for nested agents
* feat(subagents): system prompt, docs, changelog for nested sub-agents
* fix(subagents): prevent model fallback override, show model during active runs, and block context overflow fallback
Bug 1: When a session has an explicit model override (e.g., gpt/openai-codex),
the fallback candidate logic in resolveFallbackCandidates silently appended the
global primary model (opus) as a backstop. On reinjection/steer with a transient
error, the session could fall back to opus which has a smaller context window
and crash. Fix: when storedModelOverride is set, pass fallbacksOverride ?? []
instead of undefined, preventing the implicit primary backstop.
Bug 2: Active subagents showed 'model n/a' in /subagents list because
resolveModelDisplay only read entry.model/modelProvider (populated after run
completes). Fix: fall back to modelOverride/providerOverride fields which are
populated at spawn time via sessions.patch.
Bug 3: Context overflow errors (prompt too long, context_length_exceeded) could
theoretically escape runEmbeddedPiAgent and be treated as failover candidates
in runWithModelFallback, causing a switch to a model with a smaller context
window. Fix: in runWithModelFallback, detect context overflow errors via
isLikelyContextOverflowError and rethrow them immediately instead of trying the
next model candidate.
* fix(subagents): track spawn depth in session store and fix announce routing for nested agents
* Fix compaction status tracking and dedupe overflow compaction triggers
* fix(subagents): enforce depth block via session store and implement cascade kill
* fix: inject group chat context into system prompt
* fix(subagents): always write model to session store at spawn time
* Preserve spawnDepth when agent handler rewrites session entry
* fix(subagents): suppress announce on steer-restart
* fix(subagents): fallback spawned session model to runtime default
* fix(subagents): enforce spawn depth when caller key resolves by sessionId
* feat(subagents): implement active-first ordering for numeric targets and enhance task display
- Added a test to verify that subagents with numeric targets follow an active-first list ordering.
- Updated `resolveSubagentTarget` to sort subagent runs based on active status and recent activity.
- Enhanced task display in command responses to prevent truncation of long task descriptions.
- Introduced new utility functions for compacting task text and managing subagent run states.
* fix(subagents): show model for active runs via run record fallback
When the spawned model matches the agent's default model, the session
store's override fields are intentionally cleared (isDefault: true).
The model/modelProvider fields are only populated after the run
completes. This left active subagents showing 'model n/a'.
Fix: store the resolved model on SubagentRunRecord at registration
time, and use it as a fallback in both display paths (subagents tool
and /subagents command) when the session store entry has no model info.
Changes:
- SubagentRunRecord: add optional model field
- registerSubagentRun: accept and persist model param
- sessions-spawn-tool: pass resolvedModel to registerSubagentRun
- subagents-tool: pass run record model as fallback to resolveModelDisplay
- commands-subagents: pass run record model as fallback to resolveModelDisplay
* feat(chat): implement session key resolution and reset on sidebar navigation
- Added functions to resolve the main session key and reset chat state when switching sessions from the sidebar.
- Updated the `renderTab` function to handle session key changes when navigating to the chat tab.
- Introduced a test to verify that the session resets to "main" when opening chat from the sidebar navigation.
* fix: subagent timeout=0 passthrough and fallback prompt duplication
Bug 1: runTimeoutSeconds=0 now means 'no timeout' instead of applying 600s default
- sessions-spawn-tool: default to undefined (not 0) when neither timeout param
is provided; use != null check so explicit 0 passes through to gateway
- agent.ts: accept 0 as valid timeout (resolveAgentTimeoutMs already handles
0 → MAX_SAFE_TIMEOUT_MS)
Bug 2: model fallback no longer re-injects the original prompt as a duplicate
- agent.ts: track fallback attempt index; on retries use a short continuation
message instead of the full original prompt since the session file already
contains it from the first attempt
- Also skip re-sending images on fallback retries (already in session)
* feat(subagents): truncate long task descriptions in subagents command output
- Introduced a new utility function to format task previews, limiting their length to improve readability.
- Updated the command handler to use the new formatting function, ensuring task descriptions are truncated appropriately.
- Adjusted related tests to verify that long task descriptions are now truncated in the output.
* refactor(subagents): update subagent registry path resolution and improve command output formatting
- Replaced direct import of STATE_DIR with a utility function to resolve the state directory dynamically.
- Enhanced the formatting of command output for active and recent subagents, adding separators for better readability.
- Updated related tests to reflect changes in command output structure.
* fix(subagent): default sessions_spawn to no timeout when runTimeoutSeconds omitted
The previous fix (75a791106) correctly handled the case where
runTimeoutSeconds was explicitly set to 0 ("no timeout"). However,
when models omit the parameter entirely (which is common since the
schema marks it as optional), runTimeoutSeconds resolved to undefined.
undefined flowed through the chain as:
sessions_spawn → timeout: undefined (since undefined != null is false)
→ gateway agent handler → agentCommand opts.timeout: undefined
→ resolveAgentTimeoutMs({ overrideSeconds: undefined })
→ DEFAULT_AGENT_TIMEOUT_SECONDS (600s = 10 minutes)
This caused subagents to be killed at exactly 10 minutes even though
the user's intent (via TOOLS.md) was for subagents to run without a
timeout.
Fix: default runTimeoutSeconds to 0 (no timeout) when neither
runTimeoutSeconds nor timeoutSeconds is provided by the caller.
Subagent spawns are long-running by design and should not inherit the
600s agent-command default timeout.
* fix(subagent): accept timeout=0 in agent-via-gateway path (second 600s default)
* fix: thread timeout override through getReplyFromConfig dispatch path
getReplyFromConfig called resolveAgentTimeoutMs({ cfg }) with no override,
always falling back to the config default (600s). Add timeoutOverrideSeconds
to GetReplyOptions and pass it through as overrideSeconds so callers of the
dispatch chain can specify a custom timeout (0 = no timeout).
This complements the existing timeout threading in agentCommand and the
cron isolated-agent runner, which already pass overrideSeconds correctly.
* feat(model-fallback): normalize OpenAI Codex model references and enhance fallback handling
- Added normalization for OpenAI Codex model references, specifically converting "gpt-5.3-codex" to "openai-codex" before execution.
- Updated the `resolveFallbackCandidates` function to utilize the new normalization logic.
- Enhanced tests to verify the correct behavior of model normalization and fallback mechanisms.
- Introduced a new test case to ensure that the normalization process works as expected for various input formats.
* feat(tests): add unit tests for steer failure behavior in openclaw-tools
- Introduced a new test file to validate the behavior of subagents when steer replacement dispatch fails.
- Implemented tests to ensure that the announce behavior is restored correctly and that the suppression reason is cleared as expected.
- Enhanced the subagent registry with a new function to clear steer restart suppression.
- Updated related components to support the new test scenarios.
* fix(subagents): replace stop command with kill in slash commands and documentation
- Updated the `/subagents` command to replace `stop` with `kill` for consistency in controlling sub-agent runs.
- Modified related documentation to reflect the change in command usage.
- Removed legacy timeoutSeconds references from the sessions-spawn-tool schema and tests to streamline timeout handling.
- Enhanced tests to ensure correct behavior of the updated commands and their interactions.
* feat(tests): add unit tests for readLatestAssistantReply function
- Introduced a new test file for the `readLatestAssistantReply` function to validate its behavior with various message scenarios.
- Implemented tests to ensure the function correctly retrieves the latest assistant message and handles cases where the latest message has no text.
- Mocked the gateway call to simulate different message histories for comprehensive testing.
* feat(tests): enhance subagent kill-all cascade tests and announce formatting
- Added a new test to verify that the `kill-all` command cascades through ended parents to active descendants in subagents.
- Updated the subagent announce formatting tests to reflect changes in message structure, including the replacement of "Findings:" with "Result:" and the addition of new expectations for message content.
- Improved the handling of long findings and stats in the announce formatting logic to ensure concise output.
- Refactored related functions to enhance clarity and maintainability in the subagent registry and tools.
* refactor(subagent): update announce formatting and remove unused constants
- Modified the subagent announce formatting to replace "Findings:" with "Result:" and adjusted related expectations in tests.
- Removed constants for maximum announce findings characters and summary words, simplifying the announcement logic.
- Updated the handling of findings to retain full content instead of truncating, ensuring more informative outputs.
- Cleaned up unused imports in the commands-subagents file to enhance code clarity.
* feat(tests): enhance billing error handling in user-facing text
- Added tests to ensure that normal text mentioning billing plans is not rewritten, preserving user context.
- Updated the `isBillingErrorMessage` and `sanitizeUserFacingText` functions to improve handling of billing-related messages.
- Introduced new test cases for various scenarios involving billing messages to ensure accurate processing and output.
- Enhanced the subagent announce flow to correctly manage active descendant runs, preventing premature announcements.
* feat(subagent): enhance workflow guidance and auto-announcement clarity
- Added a new guideline in the subagent system prompt to emphasize trust in push-based completion, discouraging busy polling for status updates.
- Updated documentation to clarify that sub-agents will automatically announce their results, improving user understanding of the workflow.
- Enhanced tests to verify the new guidance on avoiding polling loops and to ensure the accuracy of the updated prompts.
* fix(cron): avoid announcing interim subagent spawn acks
* chore: clean post-rebase imports
* fix(cron): fall back to child replies when parent stays interim
* fix(subagents): make active-run guidance advisory
* fix(subagents): update announce flow to handle active descendants and enhance test coverage
- Modified the announce flow to defer announcements when active descendant runs are present, ensuring accurate status reporting.
- Updated tests to verify the new behavior, including scenarios where no fallback requester is available and ensuring proper handling of finished subagents.
- Enhanced the announce formatting to include an `expectFinal` flag for better clarity in the announcement process.
* fix(subagents): enhance announce flow and formatting for user updates
- Updated the announce flow to provide clearer instructions for user updates based on active subagent runs and requester context.
- Refactored the announcement logic to improve clarity and ensure internal context remains private.
- Enhanced tests to verify the new message expectations and formatting, including updated prompts for user-facing updates.
- Introduced a new function to build reply instructions based on session context, improving the overall announcement process.
* fix: resolve prep blockers and changelog placement (#14447) (thanks @tyler6204)
* fix: restore cron delivery-plan import after rebase (#14447) (thanks @tyler6204)
* fix: resolve test failures from rebase conflicts (#14447) (thanks @tyler6204)
* fix: apply formatting after rebase (#14447) (thanks @tyler6204)
535 lines
16 KiB
TypeScript
535 lines
16 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { resolveRequiredHomeDir } from "../infra/home-dir.js";
|
|
import { runCommandWithTimeout } from "../process/exec.js";
|
|
import { isCronSessionKey, isSubagentSessionKey } from "../routing/session-key.js";
|
|
import { resolveUserPath } from "../utils.js";
|
|
import { resolveWorkspaceTemplateDir } from "./workspace-templates.js";
|
|
|
|
export function resolveDefaultAgentWorkspaceDir(
|
|
env: NodeJS.ProcessEnv = process.env,
|
|
homedir: () => string = os.homedir,
|
|
): string {
|
|
const home = resolveRequiredHomeDir(env, homedir);
|
|
const profile = env.OPENCLAW_PROFILE?.trim();
|
|
if (profile && profile.toLowerCase() !== "default") {
|
|
return path.join(home, ".openclaw", `workspace-${profile}`);
|
|
}
|
|
return path.join(home, ".openclaw", "workspace");
|
|
}
|
|
|
|
export const DEFAULT_AGENT_WORKSPACE_DIR = resolveDefaultAgentWorkspaceDir();
|
|
export const DEFAULT_AGENTS_FILENAME = "AGENTS.md";
|
|
export const DEFAULT_SOUL_FILENAME = "SOUL.md";
|
|
export const DEFAULT_TOOLS_FILENAME = "TOOLS.md";
|
|
export const DEFAULT_IDENTITY_FILENAME = "IDENTITY.md";
|
|
export const DEFAULT_USER_FILENAME = "USER.md";
|
|
export const DEFAULT_HEARTBEAT_FILENAME = "HEARTBEAT.md";
|
|
export const DEFAULT_BOOTSTRAP_FILENAME = "BOOTSTRAP.md";
|
|
export const DEFAULT_MEMORY_FILENAME = "MEMORY.md";
|
|
export const DEFAULT_MEMORY_ALT_FILENAME = "memory.md";
|
|
const WORKSPACE_STATE_DIRNAME = ".openclaw";
|
|
const WORKSPACE_STATE_FILENAME = "workspace-state.json";
|
|
const WORKSPACE_STATE_VERSION = 1;
|
|
|
|
const workspaceTemplateCache = new Map<string, Promise<string>>();
|
|
let gitAvailabilityPromise: Promise<boolean> | null = null;
|
|
|
|
function stripFrontMatter(content: string): string {
|
|
if (!content.startsWith("---")) {
|
|
return content;
|
|
}
|
|
const endIndex = content.indexOf("\n---", 3);
|
|
if (endIndex === -1) {
|
|
return content;
|
|
}
|
|
const start = endIndex + "\n---".length;
|
|
let trimmed = content.slice(start);
|
|
trimmed = trimmed.replace(/^\s+/, "");
|
|
return trimmed;
|
|
}
|
|
|
|
async function loadTemplate(name: string): Promise<string> {
|
|
const cached = workspaceTemplateCache.get(name);
|
|
if (cached) {
|
|
return cached;
|
|
}
|
|
|
|
const pending = (async () => {
|
|
const templateDir = await resolveWorkspaceTemplateDir();
|
|
const templatePath = path.join(templateDir, name);
|
|
try {
|
|
const content = await fs.readFile(templatePath, "utf-8");
|
|
return stripFrontMatter(content);
|
|
} catch {
|
|
throw new Error(
|
|
`Missing workspace template: ${name} (${templatePath}). Ensure docs/reference/templates are packaged.`,
|
|
);
|
|
}
|
|
})();
|
|
|
|
workspaceTemplateCache.set(name, pending);
|
|
try {
|
|
return await pending;
|
|
} catch (error) {
|
|
workspaceTemplateCache.delete(name);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
export type WorkspaceBootstrapFileName =
|
|
| typeof DEFAULT_AGENTS_FILENAME
|
|
| typeof DEFAULT_SOUL_FILENAME
|
|
| typeof DEFAULT_TOOLS_FILENAME
|
|
| typeof DEFAULT_IDENTITY_FILENAME
|
|
| typeof DEFAULT_USER_FILENAME
|
|
| typeof DEFAULT_HEARTBEAT_FILENAME
|
|
| typeof DEFAULT_BOOTSTRAP_FILENAME
|
|
| typeof DEFAULT_MEMORY_FILENAME
|
|
| typeof DEFAULT_MEMORY_ALT_FILENAME;
|
|
|
|
export type WorkspaceBootstrapFile = {
|
|
name: WorkspaceBootstrapFileName;
|
|
path: string;
|
|
content?: string;
|
|
missing: boolean;
|
|
};
|
|
|
|
type WorkspaceOnboardingState = {
|
|
version: typeof WORKSPACE_STATE_VERSION;
|
|
bootstrapSeededAt?: string;
|
|
onboardingCompletedAt?: string;
|
|
};
|
|
|
|
/** Set of recognized bootstrap filenames for runtime validation */
|
|
const VALID_BOOTSTRAP_NAMES: ReadonlySet<string> = new Set([
|
|
DEFAULT_AGENTS_FILENAME,
|
|
DEFAULT_SOUL_FILENAME,
|
|
DEFAULT_TOOLS_FILENAME,
|
|
DEFAULT_IDENTITY_FILENAME,
|
|
DEFAULT_USER_FILENAME,
|
|
DEFAULT_HEARTBEAT_FILENAME,
|
|
DEFAULT_BOOTSTRAP_FILENAME,
|
|
DEFAULT_MEMORY_FILENAME,
|
|
DEFAULT_MEMORY_ALT_FILENAME,
|
|
]);
|
|
|
|
async function writeFileIfMissing(filePath: string, content: string): Promise<boolean> {
|
|
try {
|
|
await fs.writeFile(filePath, content, {
|
|
encoding: "utf-8",
|
|
flag: "wx",
|
|
});
|
|
return true;
|
|
} catch (err) {
|
|
const anyErr = err as { code?: string };
|
|
if (anyErr.code !== "EEXIST") {
|
|
throw err;
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
|
|
async function fileExists(filePath: string): Promise<boolean> {
|
|
try {
|
|
await fs.access(filePath);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
function resolveWorkspaceStatePath(dir: string): string {
|
|
return path.join(dir, WORKSPACE_STATE_DIRNAME, WORKSPACE_STATE_FILENAME);
|
|
}
|
|
|
|
function parseWorkspaceOnboardingState(raw: string): WorkspaceOnboardingState | null {
|
|
try {
|
|
const parsed = JSON.parse(raw) as {
|
|
bootstrapSeededAt?: unknown;
|
|
onboardingCompletedAt?: unknown;
|
|
};
|
|
if (!parsed || typeof parsed !== "object") {
|
|
return null;
|
|
}
|
|
return {
|
|
version: WORKSPACE_STATE_VERSION,
|
|
bootstrapSeededAt:
|
|
typeof parsed.bootstrapSeededAt === "string" ? parsed.bootstrapSeededAt : undefined,
|
|
onboardingCompletedAt:
|
|
typeof parsed.onboardingCompletedAt === "string" ? parsed.onboardingCompletedAt : undefined,
|
|
};
|
|
} catch {
|
|
return null;
|
|
}
|
|
}
|
|
|
|
async function readWorkspaceOnboardingState(statePath: string): Promise<WorkspaceOnboardingState> {
|
|
try {
|
|
const raw = await fs.readFile(statePath, "utf-8");
|
|
return (
|
|
parseWorkspaceOnboardingState(raw) ?? {
|
|
version: WORKSPACE_STATE_VERSION,
|
|
}
|
|
);
|
|
} catch (err) {
|
|
const anyErr = err as { code?: string };
|
|
if (anyErr.code !== "ENOENT") {
|
|
throw err;
|
|
}
|
|
return {
|
|
version: WORKSPACE_STATE_VERSION,
|
|
};
|
|
}
|
|
}
|
|
|
|
async function writeWorkspaceOnboardingState(
|
|
statePath: string,
|
|
state: WorkspaceOnboardingState,
|
|
): Promise<void> {
|
|
await fs.mkdir(path.dirname(statePath), { recursive: true });
|
|
const payload = `${JSON.stringify(state, null, 2)}\n`;
|
|
const tmpPath = `${statePath}.tmp-${process.pid}-${Date.now().toString(36)}`;
|
|
try {
|
|
await fs.writeFile(tmpPath, payload, { encoding: "utf-8" });
|
|
await fs.rename(tmpPath, statePath);
|
|
} catch (err) {
|
|
await fs.unlink(tmpPath).catch(() => {});
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
async function hasGitRepo(dir: string): Promise<boolean> {
|
|
try {
|
|
await fs.stat(path.join(dir, ".git"));
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
async function isGitAvailable(): Promise<boolean> {
|
|
if (gitAvailabilityPromise) {
|
|
return gitAvailabilityPromise;
|
|
}
|
|
|
|
gitAvailabilityPromise = (async () => {
|
|
try {
|
|
const result = await runCommandWithTimeout(["git", "--version"], { timeoutMs: 2_000 });
|
|
return result.code === 0;
|
|
} catch {
|
|
return false;
|
|
}
|
|
})();
|
|
|
|
return gitAvailabilityPromise;
|
|
}
|
|
|
|
async function ensureGitRepo(dir: string, isBrandNewWorkspace: boolean) {
|
|
if (!isBrandNewWorkspace) {
|
|
return;
|
|
}
|
|
if (await hasGitRepo(dir)) {
|
|
return;
|
|
}
|
|
if (!(await isGitAvailable())) {
|
|
return;
|
|
}
|
|
try {
|
|
await runCommandWithTimeout(["git", "init"], { cwd: dir, timeoutMs: 10_000 });
|
|
} catch {
|
|
// Ignore git init failures; workspace creation should still succeed.
|
|
}
|
|
}
|
|
|
|
export async function ensureAgentWorkspace(params?: {
|
|
dir?: string;
|
|
ensureBootstrapFiles?: boolean;
|
|
}): Promise<{
|
|
dir: string;
|
|
agentsPath?: string;
|
|
soulPath?: string;
|
|
toolsPath?: string;
|
|
identityPath?: string;
|
|
userPath?: string;
|
|
heartbeatPath?: string;
|
|
bootstrapPath?: string;
|
|
}> {
|
|
const rawDir = params?.dir?.trim() ? params.dir.trim() : DEFAULT_AGENT_WORKSPACE_DIR;
|
|
const dir = resolveUserPath(rawDir);
|
|
await fs.mkdir(dir, { recursive: true });
|
|
|
|
if (!params?.ensureBootstrapFiles) {
|
|
return { dir };
|
|
}
|
|
|
|
const agentsPath = path.join(dir, DEFAULT_AGENTS_FILENAME);
|
|
const soulPath = path.join(dir, DEFAULT_SOUL_FILENAME);
|
|
const toolsPath = path.join(dir, DEFAULT_TOOLS_FILENAME);
|
|
const identityPath = path.join(dir, DEFAULT_IDENTITY_FILENAME);
|
|
const userPath = path.join(dir, DEFAULT_USER_FILENAME);
|
|
const heartbeatPath = path.join(dir, DEFAULT_HEARTBEAT_FILENAME);
|
|
const bootstrapPath = path.join(dir, DEFAULT_BOOTSTRAP_FILENAME);
|
|
const statePath = resolveWorkspaceStatePath(dir);
|
|
|
|
const isBrandNewWorkspace = await (async () => {
|
|
const paths = [agentsPath, soulPath, toolsPath, identityPath, userPath, heartbeatPath];
|
|
const existing = await Promise.all(
|
|
paths.map(async (p) => {
|
|
try {
|
|
await fs.access(p);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}),
|
|
);
|
|
return existing.every((v) => !v);
|
|
})();
|
|
|
|
const agentsTemplate = await loadTemplate(DEFAULT_AGENTS_FILENAME);
|
|
const soulTemplate = await loadTemplate(DEFAULT_SOUL_FILENAME);
|
|
const toolsTemplate = await loadTemplate(DEFAULT_TOOLS_FILENAME);
|
|
const identityTemplate = await loadTemplate(DEFAULT_IDENTITY_FILENAME);
|
|
const userTemplate = await loadTemplate(DEFAULT_USER_FILENAME);
|
|
const heartbeatTemplate = await loadTemplate(DEFAULT_HEARTBEAT_FILENAME);
|
|
await writeFileIfMissing(agentsPath, agentsTemplate);
|
|
await writeFileIfMissing(soulPath, soulTemplate);
|
|
await writeFileIfMissing(toolsPath, toolsTemplate);
|
|
await writeFileIfMissing(identityPath, identityTemplate);
|
|
await writeFileIfMissing(userPath, userTemplate);
|
|
await writeFileIfMissing(heartbeatPath, heartbeatTemplate);
|
|
|
|
let state = await readWorkspaceOnboardingState(statePath);
|
|
let stateDirty = false;
|
|
const markState = (next: Partial<WorkspaceOnboardingState>) => {
|
|
state = { ...state, ...next };
|
|
stateDirty = true;
|
|
};
|
|
const nowIso = () => new Date().toISOString();
|
|
|
|
let bootstrapExists = await fileExists(bootstrapPath);
|
|
if (!state.bootstrapSeededAt && bootstrapExists) {
|
|
markState({ bootstrapSeededAt: nowIso() });
|
|
}
|
|
|
|
if (!state.onboardingCompletedAt && state.bootstrapSeededAt && !bootstrapExists) {
|
|
markState({ onboardingCompletedAt: nowIso() });
|
|
}
|
|
|
|
if (!state.bootstrapSeededAt && !state.onboardingCompletedAt && !bootstrapExists) {
|
|
// Legacy migration path: if USER/IDENTITY diverged from templates, treat onboarding as complete
|
|
// and avoid recreating BOOTSTRAP for already-onboarded workspaces.
|
|
const [identityContent, userContent] = await Promise.all([
|
|
fs.readFile(identityPath, "utf-8"),
|
|
fs.readFile(userPath, "utf-8"),
|
|
]);
|
|
const legacyOnboardingCompleted =
|
|
identityContent !== identityTemplate || userContent !== userTemplate;
|
|
if (legacyOnboardingCompleted) {
|
|
markState({ onboardingCompletedAt: nowIso() });
|
|
} else {
|
|
const bootstrapTemplate = await loadTemplate(DEFAULT_BOOTSTRAP_FILENAME);
|
|
const wroteBootstrap = await writeFileIfMissing(bootstrapPath, bootstrapTemplate);
|
|
if (!wroteBootstrap) {
|
|
bootstrapExists = await fileExists(bootstrapPath);
|
|
} else {
|
|
bootstrapExists = true;
|
|
}
|
|
if (bootstrapExists && !state.bootstrapSeededAt) {
|
|
markState({ bootstrapSeededAt: nowIso() });
|
|
}
|
|
}
|
|
}
|
|
|
|
if (stateDirty) {
|
|
await writeWorkspaceOnboardingState(statePath, state);
|
|
}
|
|
await ensureGitRepo(dir, isBrandNewWorkspace);
|
|
|
|
return {
|
|
dir,
|
|
agentsPath,
|
|
soulPath,
|
|
toolsPath,
|
|
identityPath,
|
|
userPath,
|
|
heartbeatPath,
|
|
bootstrapPath,
|
|
};
|
|
}
|
|
|
|
async function resolveMemoryBootstrapEntries(
|
|
resolvedDir: string,
|
|
): Promise<Array<{ name: WorkspaceBootstrapFileName; filePath: string }>> {
|
|
const candidates: WorkspaceBootstrapFileName[] = [
|
|
DEFAULT_MEMORY_FILENAME,
|
|
DEFAULT_MEMORY_ALT_FILENAME,
|
|
];
|
|
const entries: Array<{ name: WorkspaceBootstrapFileName; filePath: string }> = [];
|
|
for (const name of candidates) {
|
|
const filePath = path.join(resolvedDir, name);
|
|
try {
|
|
await fs.access(filePath);
|
|
entries.push({ name, filePath });
|
|
} catch {
|
|
// optional
|
|
}
|
|
}
|
|
if (entries.length <= 1) {
|
|
return entries;
|
|
}
|
|
|
|
const seen = new Set<string>();
|
|
const deduped: Array<{ name: WorkspaceBootstrapFileName; filePath: string }> = [];
|
|
for (const entry of entries) {
|
|
let key = entry.filePath;
|
|
try {
|
|
key = await fs.realpath(entry.filePath);
|
|
} catch {}
|
|
if (seen.has(key)) {
|
|
continue;
|
|
}
|
|
seen.add(key);
|
|
deduped.push(entry);
|
|
}
|
|
return deduped;
|
|
}
|
|
|
|
export async function loadWorkspaceBootstrapFiles(dir: string): Promise<WorkspaceBootstrapFile[]> {
|
|
const resolvedDir = resolveUserPath(dir);
|
|
|
|
const entries: Array<{
|
|
name: WorkspaceBootstrapFileName;
|
|
filePath: string;
|
|
}> = [
|
|
{
|
|
name: DEFAULT_AGENTS_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_AGENTS_FILENAME),
|
|
},
|
|
{
|
|
name: DEFAULT_SOUL_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_SOUL_FILENAME),
|
|
},
|
|
{
|
|
name: DEFAULT_TOOLS_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_TOOLS_FILENAME),
|
|
},
|
|
{
|
|
name: DEFAULT_IDENTITY_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_IDENTITY_FILENAME),
|
|
},
|
|
{
|
|
name: DEFAULT_USER_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_USER_FILENAME),
|
|
},
|
|
{
|
|
name: DEFAULT_HEARTBEAT_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_HEARTBEAT_FILENAME),
|
|
},
|
|
{
|
|
name: DEFAULT_BOOTSTRAP_FILENAME,
|
|
filePath: path.join(resolvedDir, DEFAULT_BOOTSTRAP_FILENAME),
|
|
},
|
|
];
|
|
|
|
entries.push(...(await resolveMemoryBootstrapEntries(resolvedDir)));
|
|
|
|
const result: WorkspaceBootstrapFile[] = [];
|
|
for (const entry of entries) {
|
|
try {
|
|
const content = await fs.readFile(entry.filePath, "utf-8");
|
|
result.push({
|
|
name: entry.name,
|
|
path: entry.filePath,
|
|
content,
|
|
missing: false,
|
|
});
|
|
} catch {
|
|
result.push({ name: entry.name, path: entry.filePath, missing: true });
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
const MINIMAL_BOOTSTRAP_ALLOWLIST = new Set([DEFAULT_AGENTS_FILENAME, DEFAULT_TOOLS_FILENAME]);
|
|
|
|
export function filterBootstrapFilesForSession(
|
|
files: WorkspaceBootstrapFile[],
|
|
sessionKey?: string,
|
|
): WorkspaceBootstrapFile[] {
|
|
if (!sessionKey || (!isSubagentSessionKey(sessionKey) && !isCronSessionKey(sessionKey))) {
|
|
return files;
|
|
}
|
|
return files.filter((file) => MINIMAL_BOOTSTRAP_ALLOWLIST.has(file.name));
|
|
}
|
|
|
|
export async function loadExtraBootstrapFiles(
|
|
dir: string,
|
|
extraPatterns: string[],
|
|
): Promise<WorkspaceBootstrapFile[]> {
|
|
if (!extraPatterns.length) {
|
|
return [];
|
|
}
|
|
const resolvedDir = resolveUserPath(dir);
|
|
let realResolvedDir = resolvedDir;
|
|
try {
|
|
realResolvedDir = await fs.realpath(resolvedDir);
|
|
} catch {
|
|
// Keep lexical root if realpath fails.
|
|
}
|
|
|
|
// Resolve glob patterns into concrete file paths
|
|
const resolvedPaths = new Set<string>();
|
|
for (const pattern of extraPatterns) {
|
|
if (pattern.includes("*") || pattern.includes("?") || pattern.includes("{")) {
|
|
try {
|
|
const matches = fs.glob(pattern, { cwd: resolvedDir });
|
|
for await (const m of matches) {
|
|
resolvedPaths.add(m);
|
|
}
|
|
} catch {
|
|
// glob not available or pattern error — fall back to literal
|
|
resolvedPaths.add(pattern);
|
|
}
|
|
} else {
|
|
resolvedPaths.add(pattern);
|
|
}
|
|
}
|
|
|
|
const result: WorkspaceBootstrapFile[] = [];
|
|
for (const relPath of resolvedPaths) {
|
|
const filePath = path.resolve(resolvedDir, relPath);
|
|
// Guard against path traversal — resolved path must stay within workspace
|
|
if (!filePath.startsWith(resolvedDir + path.sep) && filePath !== resolvedDir) {
|
|
continue;
|
|
}
|
|
try {
|
|
// Resolve symlinks and verify the real path is still within workspace
|
|
const realFilePath = await fs.realpath(filePath);
|
|
if (
|
|
!realFilePath.startsWith(realResolvedDir + path.sep) &&
|
|
realFilePath !== realResolvedDir
|
|
) {
|
|
continue;
|
|
}
|
|
// Only load files whose basename is a recognized bootstrap filename
|
|
const baseName = path.basename(relPath);
|
|
if (!VALID_BOOTSTRAP_NAMES.has(baseName)) {
|
|
continue;
|
|
}
|
|
const content = await fs.readFile(realFilePath, "utf-8");
|
|
result.push({
|
|
name: baseName as WorkspaceBootstrapFileName,
|
|
path: filePath,
|
|
content,
|
|
missing: false,
|
|
});
|
|
} catch {
|
|
// Silently skip missing extra files
|
|
}
|
|
}
|
|
return result;
|
|
}
|