@sireai/optimus 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.env.example +16 -0
- package/LICENSE +21 -0
- package/README.md +104 -0
- package/dist/cli/optimus.d.ts +2 -0
- package/dist/cli/optimus.js +2951 -0
- package/dist/cli/optimus.js.map +1 -0
- package/dist/cli/self-update.d.ts +49 -0
- package/dist/cli/self-update.js +264 -0
- package/dist/cli/self-update.js.map +1 -0
- package/dist/config/load-config.d.ts +3 -0
- package/dist/config/load-config.js +321 -0
- package/dist/config/load-config.js.map +1 -0
- package/dist/config/optimus-paths.d.ts +13 -0
- package/dist/config/optimus-paths.js +44 -0
- package/dist/config/optimus-paths.js.map +1 -0
- package/dist/index.d.ts +25 -0
- package/dist/index.js +27 -0
- package/dist/index.js.map +1 -0
- package/dist/integrations/jira/jira-cli.d.ts +1 -0
- package/dist/integrations/jira/jira-cli.js +278 -0
- package/dist/integrations/jira/jira-cli.js.map +1 -0
- package/dist/integrations/jira/jira-client.d.ts +99 -0
- package/dist/integrations/jira/jira-client.js +521 -0
- package/dist/integrations/jira/jira-client.js.map +1 -0
- package/dist/integrations/jira/jira-submit.d.ts +71 -0
- package/dist/integrations/jira/jira-submit.js +351 -0
- package/dist/integrations/jira/jira-submit.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-auth-resolver.d.ts +23 -0
- package/dist/problem-solving-core/codex/codex-auth-resolver.js +136 -0
- package/dist/problem-solving-core/codex/codex-auth-resolver.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-connectivity-checks.d.ts +6 -0
- package/dist/problem-solving-core/codex/codex-connectivity-checks.js +81 -0
- package/dist/problem-solving-core/codex/codex-connectivity-checks.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-failure-classifier.d.ts +2 -0
- package/dist/problem-solving-core/codex/codex-failure-classifier.js +49 -0
- package/dist/problem-solving-core/codex/codex-failure-classifier.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-global-config.d.ts +17 -0
- package/dist/problem-solving-core/codex/codex-global-config.js +100 -0
- package/dist/problem-solving-core/codex/codex-global-config.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-preflight.d.ts +13 -0
- package/dist/problem-solving-core/codex/codex-preflight.js +142 -0
- package/dist/problem-solving-core/codex/codex-preflight.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-provider-profile.d.ts +14 -0
- package/dist/problem-solving-core/codex/codex-provider-profile.js +68 -0
- package/dist/problem-solving-core/codex/codex-provider-profile.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-required-env.d.ts +3 -0
- package/dist/problem-solving-core/codex/codex-required-env.js +21 -0
- package/dist/problem-solving-core/codex/codex-required-env.js.map +1 -0
- package/dist/problem-solving-core/codex/codex-runner.d.ts +37 -0
- package/dist/problem-solving-core/codex/codex-runner.js +926 -0
- package/dist/problem-solving-core/codex/codex-runner.js.map +1 -0
- package/dist/problem-solving-core/codex/evolution-skill-guard.d.ts +36 -0
- package/dist/problem-solving-core/codex/evolution-skill-guard.js +143 -0
- package/dist/problem-solving-core/codex/evolution-skill-guard.js.map +1 -0
- package/dist/problem-solving-core/codex/repo-memory-service.d.ts +24 -0
- package/dist/problem-solving-core/codex/repo-memory-service.js +114 -0
- package/dist/problem-solving-core/codex/repo-memory-service.js.map +1 -0
- package/dist/problem-solving-core/codex/skill-sync-service.d.ts +35 -0
- package/dist/problem-solving-core/codex/skill-sync-service.js +280 -0
- package/dist/problem-solving-core/codex/skill-sync-service.js.map +1 -0
- package/dist/task-environment/cancellation/task-abort-registry.d.ts +17 -0
- package/dist/task-environment/cancellation/task-abort-registry.js +51 -0
- package/dist/task-environment/cancellation/task-abort-registry.js.map +1 -0
- package/dist/task-environment/cancellation/task-cancellation-service.d.ts +25 -0
- package/dist/task-environment/cancellation/task-cancellation-service.js +54 -0
- package/dist/task-environment/cancellation/task-cancellation-service.js.map +1 -0
- package/dist/task-environment/cancellation/task-cleanup-service.d.ts +22 -0
- package/dist/task-environment/cancellation/task-cleanup-service.js +67 -0
- package/dist/task-environment/cancellation/task-cleanup-service.js.map +1 -0
- package/dist/task-environment/delivery/commit-message/bugfix-commit-message-template.d.ts +13 -0
- package/dist/task-environment/delivery/commit-message/bugfix-commit-message-template.js +83 -0
- package/dist/task-environment/delivery/commit-message/bugfix-commit-message-template.js.map +1 -0
- package/dist/task-environment/delivery/commit-message/commit-message-builder.d.ts +6 -0
- package/dist/task-environment/delivery/commit-message/commit-message-builder.js +15 -0
- package/dist/task-environment/delivery/commit-message/commit-message-builder.js.map +1 -0
- package/dist/task-environment/delivery/commit-message/commit-message-template-types.d.ts +16 -0
- package/dist/task-environment/delivery/commit-message/commit-message-template-types.js +2 -0
- package/dist/task-environment/delivery/commit-message/commit-message-template-types.js.map +1 -0
- package/dist/task-environment/delivery/feishu-analysis-doc-service.d.ts +50 -0
- package/dist/task-environment/delivery/feishu-analysis-doc-service.js +454 -0
- package/dist/task-environment/delivery/feishu-analysis-doc-service.js.map +1 -0
- package/dist/task-environment/delivery/feishu-card-renderer.d.ts +38 -0
- package/dist/task-environment/delivery/feishu-card-renderer.js +449 -0
- package/dist/task-environment/delivery/feishu-card-renderer.js.map +1 -0
- package/dist/task-environment/delivery/feishu-content/feishu-content-renderer.d.ts +34 -0
- package/dist/task-environment/delivery/feishu-content/feishu-content-renderer.js +201 -0
- package/dist/task-environment/delivery/feishu-content/feishu-content-renderer.js.map +1 -0
- package/dist/task-environment/delivery/feishu-content/feishu-copy-config.d.ts +27 -0
- package/dist/task-environment/delivery/feishu-content/feishu-copy-config.js +74 -0
- package/dist/task-environment/delivery/feishu-content/feishu-copy-config.js.map +1 -0
- package/dist/task-environment/delivery/feishu-notifier.d.ts +45 -0
- package/dist/task-environment/delivery/feishu-notifier.js +250 -0
- package/dist/task-environment/delivery/feishu-notifier.js.map +1 -0
- package/dist/task-environment/delivery/feishu-templates/analysis-message-template.d.ts +6 -0
- package/dist/task-environment/delivery/feishu-templates/analysis-message-template.js +39 -0
- package/dist/task-environment/delivery/feishu-templates/analysis-message-template.js.map +1 -0
- package/dist/task-environment/delivery/feishu-templates/bugfix-message-template.d.ts +6 -0
- package/dist/task-environment/delivery/feishu-templates/bugfix-message-template.js +40 -0
- package/dist/task-environment/delivery/feishu-templates/bugfix-message-template.js.map +1 -0
- package/dist/task-environment/delivery/feishu-templates/default-message-template.d.ts +6 -0
- package/dist/task-environment/delivery/feishu-templates/default-message-template.js +33 -0
- package/dist/task-environment/delivery/feishu-templates/default-message-template.js.map +1 -0
- package/dist/task-environment/delivery/feishu-templates/patch-message-template.d.ts +6 -0
- package/dist/task-environment/delivery/feishu-templates/patch-message-template.js +40 -0
- package/dist/task-environment/delivery/feishu-templates/patch-message-template.js.map +1 -0
- package/dist/task-environment/delivery/feishu-templates/template-registry.d.ts +2 -0
- package/dist/task-environment/delivery/feishu-templates/template-registry.js +11 -0
- package/dist/task-environment/delivery/feishu-templates/template-registry.js.map +1 -0
- package/dist/task-environment/delivery/feishu-templates/template-types.d.ts +20 -0
- package/dist/task-environment/delivery/feishu-templates/template-types.js +2 -0
- package/dist/task-environment/delivery/feishu-templates/template-types.js.map +1 -0
- package/dist/task-environment/delivery/task-delivery-dispatcher.d.ts +14 -0
- package/dist/task-environment/delivery/task-delivery-dispatcher.js +109 -0
- package/dist/task-environment/delivery/task-delivery-dispatcher.js.map +1 -0
- package/dist/task-environment/delivery/task-delivery-service.d.ts +33 -0
- package/dist/task-environment/delivery/task-delivery-service.js +432 -0
- package/dist/task-environment/delivery/task-delivery-service.js.map +1 -0
- package/dist/task-environment/delivery/task-publication-service.d.ts +97 -0
- package/dist/task-environment/delivery/task-publication-service.js +1369 -0
- package/dist/task-environment/delivery/task-publication-service.js.map +1 -0
- package/dist/task-environment/execution-addresses.d.ts +40 -0
- package/dist/task-environment/execution-addresses.js +63 -0
- package/dist/task-environment/execution-addresses.js.map +1 -0
- package/dist/task-environment/intake/cli-file-intake.d.ts +12 -0
- package/dist/task-environment/intake/cli-file-intake.js +56 -0
- package/dist/task-environment/intake/cli-file-intake.js.map +1 -0
- package/dist/task-environment/intake/manual-problem-intake.d.ts +3 -0
- package/dist/task-environment/intake/manual-problem-intake.js +57 -0
- package/dist/task-environment/intake/manual-problem-intake.js.map +1 -0
- package/dist/task-environment/intake/polling-problem-intake.d.ts +14 -0
- package/dist/task-environment/intake/polling-problem-intake.js +232 -0
- package/dist/task-environment/intake/polling-problem-intake.js.map +1 -0
- package/dist/task-environment/observability/logger.d.ts +76 -0
- package/dist/task-environment/observability/logger.js +604 -0
- package/dist/task-environment/observability/logger.js.map +1 -0
- package/dist/task-environment/observability/runtime-panel.d.ts +82 -0
- package/dist/task-environment/observability/runtime-panel.js +1008 -0
- package/dist/task-environment/observability/runtime-panel.js.map +1 -0
- package/dist/task-environment/observability/sound-notifier.d.ts +18 -0
- package/dist/task-environment/observability/sound-notifier.js +71 -0
- package/dist/task-environment/observability/sound-notifier.js.map +1 -0
- package/dist/task-environment/orchestration/execution-context-assembler.d.ts +41 -0
- package/dist/task-environment/orchestration/execution-context-assembler.js +464 -0
- package/dist/task-environment/orchestration/execution-context-assembler.js.map +1 -0
- package/dist/task-environment/orchestration/git-change-classifier.d.ts +19 -0
- package/dist/task-environment/orchestration/git-change-classifier.js +106 -0
- package/dist/task-environment/orchestration/git-change-classifier.js.map +1 -0
- package/dist/task-environment/orchestration/harness-registry.d.ts +27 -0
- package/dist/task-environment/orchestration/harness-registry.js +116 -0
- package/dist/task-environment/orchestration/harness-registry.js.map +1 -0
- package/dist/task-environment/orchestration/harness-resolver.d.ts +8 -0
- package/dist/task-environment/orchestration/harness-resolver.js +39 -0
- package/dist/task-environment/orchestration/harness-resolver.js.map +1 -0
- package/dist/task-environment/orchestration/task-orchestrator.d.ts +45 -0
- package/dist/task-environment/orchestration/task-orchestrator.js +1122 -0
- package/dist/task-environment/orchestration/task-orchestrator.js.map +1 -0
- package/dist/task-environment/orchestration/task-package-assembler.d.ts +4 -0
- package/dist/task-environment/orchestration/task-package-assembler.js +10 -0
- package/dist/task-environment/orchestration/task-package-assembler.js.map +1 -0
- package/dist/task-environment/orchestration/triage-agent.d.ts +54 -0
- package/dist/task-environment/orchestration/triage-agent.js +636 -0
- package/dist/task-environment/orchestration/triage-agent.js.map +1 -0
- package/dist/task-environment/orchestration/triage-runner.d.ts +65 -0
- package/dist/task-environment/orchestration/triage-runner.js +655 -0
- package/dist/task-environment/orchestration/triage-runner.js.map +1 -0
- package/dist/task-environment/publication-target.d.ts +12 -0
- package/dist/task-environment/publication-target.js +174 -0
- package/dist/task-environment/publication-target.js.map +1 -0
- package/dist/task-environment/runtime/blocking-event-queue.d.ts +7 -0
- package/dist/task-environment/runtime/blocking-event-queue.js +27 -0
- package/dist/task-environment/runtime/blocking-event-queue.js.map +1 -0
- package/dist/task-environment/runtime/optimus-runtime.d.ts +69 -0
- package/dist/task-environment/runtime/optimus-runtime.js +751 -0
- package/dist/task-environment/runtime/optimus-runtime.js.map +1 -0
- package/dist/task-environment/storage/sqlite-event-store.d.ts +52 -0
- package/dist/task-environment/storage/sqlite-event-store.js +288 -0
- package/dist/task-environment/storage/sqlite-event-store.js.map +1 -0
- package/dist/task-environment/storage/sqlite-task-store.d.ts +122 -0
- package/dist/task-environment/storage/sqlite-task-store.js +1182 -0
- package/dist/task-environment/storage/sqlite-task-store.js.map +1 -0
- package/dist/types.d.ts +629 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/embedded-skills/shared/repo-inspection/SKILL.md +9 -0
- package/embedded-skills/shared/repo-inspection/skill.json +5 -0
- package/embedded-skills/task/bugfix/android-debug-protocol/SKILL.md +10 -0
- package/embedded-skills/task/bugfix/android-debug-protocol/skill.json +6 -0
- package/harness/AGENTS.md +30 -0
- package/harness/CHECKLIST.md +44 -0
- package/harness/CONSTRAINTS.md +60 -0
- package/harness/FRAMEWORK.md +28 -0
- package/harness/GOAL.md +28 -0
- package/harness/HANDOFF.md +45 -0
- package/harness/TASK_PLAN.md +79 -0
- package/optimus.config.template.json +34 -0
- package/package.json +109 -0
- package/task-harnesses/bugfix/ACCEPT.md +47 -0
- package/task-harnesses/bugfix/CONSTRAINTS.md +46 -0
- package/task-harnesses/bugfix/CONTEXT.md +29 -0
- package/task-harnesses/bugfix/EVOLUTION.md +82 -0
- package/task-harnesses/bugfix/ROLE.md +29 -0
- package/task-harnesses/bugfix/STANDARD.md +250 -0
- package/task-harnesses/bugfix/manifest.json +13 -0
- package/task-harnesses/registry.json +8 -0
|
@@ -0,0 +1,280 @@
|
|
|
1
|
+
import { createHash } from "node:crypto";
|
|
2
|
+
import { lstat, mkdir, readdir, readFile, rm, symlink, writeFile } from "node:fs/promises";
|
|
3
|
+
import { basename, join, relative, resolve } from "node:path";
|
|
4
|
+
const SKILL_MANIFEST_FILE = "skill.json";
|
|
5
|
+
// SkillSyncService owns the packaged builtin skill lifecycle.
|
|
6
|
+
// It syncs embedded skills into a runtime-controlled store and mounts the relevant subset into each workspace.
|
|
7
|
+
export class SkillSyncService {
|
|
8
|
+
config;
|
|
9
|
+
constructor(config) {
|
|
10
|
+
this.config = config;
|
|
11
|
+
}
|
|
12
|
+
async syncBuiltinSkills() {
|
|
13
|
+
await mkdir(this.config.skills.storeDir, { recursive: true });
|
|
14
|
+
const discovered = await this.discoverBuiltinSkills();
|
|
15
|
+
const installed = [];
|
|
16
|
+
const activeStoreDirs = new Set();
|
|
17
|
+
for (const skill of discovered) {
|
|
18
|
+
const storeDir = join(this.config.skills.storeDir, skill.sourceKind, skill.level, skill.id, skill.version);
|
|
19
|
+
await this.copySkillDirectory(skill.skillDir, storeDir);
|
|
20
|
+
const installedSkill = {
|
|
21
|
+
id: skill.id,
|
|
22
|
+
level: skill.level,
|
|
23
|
+
sourceKind: skill.sourceKind,
|
|
24
|
+
version: skill.version,
|
|
25
|
+
taskTypes: skill.taskTypes,
|
|
26
|
+
sourceDir: skill.skillDir,
|
|
27
|
+
storeDir,
|
|
28
|
+
mountName: skill.id,
|
|
29
|
+
contentHash: skill.contentHash
|
|
30
|
+
};
|
|
31
|
+
installed.push(installedSkill);
|
|
32
|
+
activeStoreDirs.add(resolve(storeDir));
|
|
33
|
+
}
|
|
34
|
+
await this.writeSkillIndex(installed);
|
|
35
|
+
await this.pruneStaleSkillStore(activeStoreDirs);
|
|
36
|
+
return installed;
|
|
37
|
+
}
|
|
38
|
+
async readInstalledSkills() {
|
|
39
|
+
const indexPath = this.getSkillIndexPath();
|
|
40
|
+
try {
|
|
41
|
+
const raw = await readFile(indexPath, "utf8");
|
|
42
|
+
const parsed = JSON.parse(raw);
|
|
43
|
+
return Array.isArray(parsed.installedSkills) ? parsed.installedSkills : [];
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return [];
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
async assembleWorkspaceSkills(input) {
|
|
50
|
+
const installedSkills = await this.readInstalledSkills();
|
|
51
|
+
const selectedSkills = installedSkills.filter((skill) => this.shouldExposeSkill(skill, input.taskType));
|
|
52
|
+
const workspaceSkillMountDir = join(input.workspaceDir, ".agents", "skills");
|
|
53
|
+
await mkdir(workspaceSkillMountDir, { recursive: true });
|
|
54
|
+
const mountedSkills = [];
|
|
55
|
+
for (const skill of selectedSkills) {
|
|
56
|
+
const targetDir = join(workspaceSkillMountDir, skill.mountName);
|
|
57
|
+
await rm(targetDir, { recursive: true, force: true });
|
|
58
|
+
// Use absolute symlinks so mounted skills remain readable even when the workspace root itself is a git worktree.
|
|
59
|
+
await symlink(skill.storeDir, targetDir, "dir");
|
|
60
|
+
mountedSkills.push({
|
|
61
|
+
id: skill.id,
|
|
62
|
+
level: skill.level,
|
|
63
|
+
sourceKind: skill.sourceKind,
|
|
64
|
+
version: skill.version,
|
|
65
|
+
taskTypes: skill.taskTypes,
|
|
66
|
+
sourceDir: skill.storeDir,
|
|
67
|
+
targetDir,
|
|
68
|
+
mountName: skill.mountName
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
if (input.resolvedExecutionMode !== "inplace") {
|
|
72
|
+
return {
|
|
73
|
+
workspaceSkillMountDir,
|
|
74
|
+
mountedSkills
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
workspaceSkillMountDir,
|
|
79
|
+
mountedSkills,
|
|
80
|
+
cleanup: async () => {
|
|
81
|
+
for (const mount of mountedSkills) {
|
|
82
|
+
await rm(mount.targetDir, { recursive: true, force: true });
|
|
83
|
+
}
|
|
84
|
+
await this.cleanupEmptySkillDirectories(workspaceSkillMountDir);
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
shouldExposeSkill(skill, taskType) {
|
|
89
|
+
if (this.config.skills.disabledSkills.includes(skill.id)) {
|
|
90
|
+
return false;
|
|
91
|
+
}
|
|
92
|
+
if (skill.level === "shared") {
|
|
93
|
+
return this.config.skills.sharedEnabled;
|
|
94
|
+
}
|
|
95
|
+
return this.config.skills.taskLevelEnabled && skill.taskTypes.includes(taskType);
|
|
96
|
+
}
|
|
97
|
+
async discoverBuiltinSkills() {
|
|
98
|
+
const discovered = [];
|
|
99
|
+
await this.collectSkillsFromRoot(discovered, this.config.skills.embeddedRootDir, "embedded", true);
|
|
100
|
+
await this.collectSkillsFromRoot(discovered, this.config.skills.evolutionRootDir, "evolution", false);
|
|
101
|
+
return discovered.sort((left, right) => `${left.sourceKind}:${left.level}:${left.id}`.localeCompare(`${right.sourceKind}:${right.level}:${right.id}`));
|
|
102
|
+
}
|
|
103
|
+
// Embedded skills remain read-only release assets, while evolution skills are runtime-created task-level assets.
|
|
104
|
+
async collectSkillsFromRoot(discovered, rootDir, sourceKind, allowShared) {
|
|
105
|
+
if (allowShared) {
|
|
106
|
+
const sharedRoot = join(rootDir, "shared");
|
|
107
|
+
for (const skillDir of await this.listDirectories(sharedRoot)) {
|
|
108
|
+
const discoveredSkill = await this.discoverBuiltinSkill({ level: "shared", sourceKind, skillDir });
|
|
109
|
+
if (discoveredSkill) {
|
|
110
|
+
discovered.push(discoveredSkill);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
const taskRoot = join(rootDir, "task");
|
|
115
|
+
for (const taskTypeDir of await this.listDirectories(taskRoot)) {
|
|
116
|
+
const taskType = basename(taskTypeDir);
|
|
117
|
+
for (const skillDir of await this.listDirectories(taskTypeDir)) {
|
|
118
|
+
const discoveredSkill = await this.discoverBuiltinSkill({
|
|
119
|
+
level: "task",
|
|
120
|
+
sourceKind,
|
|
121
|
+
skillDir,
|
|
122
|
+
defaultTaskType: taskType
|
|
123
|
+
});
|
|
124
|
+
if (discoveredSkill) {
|
|
125
|
+
discovered.push(discoveredSkill);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
async discoverBuiltinSkill(input) {
|
|
131
|
+
const manifest = await this.readSkillManifest(input.skillDir);
|
|
132
|
+
if (manifest?.disabled) {
|
|
133
|
+
return undefined;
|
|
134
|
+
}
|
|
135
|
+
const id = (manifest?.id ?? basename(input.skillDir)).trim();
|
|
136
|
+
// Template or placeholder directories may live beside real runtime skills, but they must never be installed.
|
|
137
|
+
if (this.shouldIgnoreSkill(input.skillDir, id)) {
|
|
138
|
+
return undefined;
|
|
139
|
+
}
|
|
140
|
+
const version = (manifest?.version ?? "1.0.0").trim();
|
|
141
|
+
const taskTypes = input.level === "shared"
|
|
142
|
+
? []
|
|
143
|
+
: this.normalizeTaskTypes(manifest?.taskTypes, input.defaultTaskType);
|
|
144
|
+
const contentHash = await this.computeDirectoryHash(input.skillDir);
|
|
145
|
+
return {
|
|
146
|
+
id,
|
|
147
|
+
level: input.level,
|
|
148
|
+
sourceKind: input.sourceKind,
|
|
149
|
+
version,
|
|
150
|
+
taskTypes,
|
|
151
|
+
skillDir: input.skillDir,
|
|
152
|
+
contentHash
|
|
153
|
+
};
|
|
154
|
+
}
|
|
155
|
+
normalizeTaskTypes(taskTypes, defaultTaskType) {
|
|
156
|
+
const normalized = (taskTypes ?? []).map((entry) => entry.trim()).filter((entry) => entry.length > 0);
|
|
157
|
+
if (normalized.length > 0) {
|
|
158
|
+
return Array.from(new Set(normalized)).sort((left, right) => left.localeCompare(right));
|
|
159
|
+
}
|
|
160
|
+
if (defaultTaskType) {
|
|
161
|
+
return [defaultTaskType];
|
|
162
|
+
}
|
|
163
|
+
return [];
|
|
164
|
+
}
|
|
165
|
+
async readSkillManifest(skillDir) {
|
|
166
|
+
const manifestPath = join(skillDir, SKILL_MANIFEST_FILE);
|
|
167
|
+
try {
|
|
168
|
+
const raw = await readFile(manifestPath, "utf8");
|
|
169
|
+
return JSON.parse(raw);
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
return undefined;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
async listDirectories(rootDir) {
|
|
176
|
+
try {
|
|
177
|
+
const entries = await readdir(rootDir, { withFileTypes: true });
|
|
178
|
+
return entries
|
|
179
|
+
.filter((entry) => entry.isDirectory() && !this.isReservedSkillDirectory(entry.name))
|
|
180
|
+
.map((entry) => join(rootDir, entry.name))
|
|
181
|
+
.sort((left, right) => left.localeCompare(right));
|
|
182
|
+
}
|
|
183
|
+
catch {
|
|
184
|
+
return [];
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
shouldIgnoreSkill(skillDir, skillId) {
|
|
188
|
+
if (this.isReservedSkillDirectory(basename(skillDir))) {
|
|
189
|
+
return true;
|
|
190
|
+
}
|
|
191
|
+
return skillId.length === 0 || skillId.includes("<replace-with-");
|
|
192
|
+
}
|
|
193
|
+
isReservedSkillDirectory(name) {
|
|
194
|
+
return name.startsWith("_");
|
|
195
|
+
}
|
|
196
|
+
async copySkillDirectory(sourceDir, targetDir) {
|
|
197
|
+
await rm(targetDir, { recursive: true, force: true });
|
|
198
|
+
await mkdir(targetDir, { recursive: true });
|
|
199
|
+
const entries = await readdir(sourceDir, { withFileTypes: true });
|
|
200
|
+
for (const entry of entries) {
|
|
201
|
+
const sourcePath = join(sourceDir, entry.name);
|
|
202
|
+
const targetPath = join(targetDir, entry.name);
|
|
203
|
+
if (entry.isDirectory()) {
|
|
204
|
+
await this.copySkillDirectory(sourcePath, targetPath);
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
const content = await readFile(sourcePath);
|
|
208
|
+
await writeFile(targetPath, content);
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
async computeDirectoryHash(rootDir) {
|
|
212
|
+
const hash = createHash("sha256");
|
|
213
|
+
await this.appendDirectoryHash(hash, rootDir, rootDir);
|
|
214
|
+
return hash.digest("hex");
|
|
215
|
+
}
|
|
216
|
+
async appendDirectoryHash(hash, rootDir, currentDir) {
|
|
217
|
+
const entries = await readdir(currentDir, { withFileTypes: true });
|
|
218
|
+
entries.sort((left, right) => left.name.localeCompare(right.name));
|
|
219
|
+
for (const entry of entries) {
|
|
220
|
+
const currentPath = join(currentDir, entry.name);
|
|
221
|
+
const relativePath = relative(rootDir, currentPath);
|
|
222
|
+
hash.update(relativePath);
|
|
223
|
+
if (entry.isDirectory()) {
|
|
224
|
+
await this.appendDirectoryHash(hash, rootDir, currentPath);
|
|
225
|
+
continue;
|
|
226
|
+
}
|
|
227
|
+
hash.update(await readFile(currentPath));
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
async writeSkillIndex(installedSkills) {
|
|
231
|
+
await mkdir(this.config.storage.rootDir, { recursive: true });
|
|
232
|
+
await writeFile(this.getSkillIndexPath(), JSON.stringify({ installedSkills }, null, 2), "utf8");
|
|
233
|
+
}
|
|
234
|
+
getSkillIndexPath() {
|
|
235
|
+
return join(this.config.storage.rootDir, "skills-index.json");
|
|
236
|
+
}
|
|
237
|
+
async pruneStaleSkillStore(activeStoreDirs) {
|
|
238
|
+
const sourceKindDirs = await this.listDirectories(this.config.skills.storeDir);
|
|
239
|
+
for (const sourceKindDir of sourceKindDirs) {
|
|
240
|
+
const levelDirs = await this.listDirectories(sourceKindDir);
|
|
241
|
+
for (const levelDir of levelDirs) {
|
|
242
|
+
const skillDirs = await this.listDirectories(levelDir);
|
|
243
|
+
for (const skillDir of skillDirs) {
|
|
244
|
+
const versionDirs = await this.listDirectories(skillDir);
|
|
245
|
+
for (const versionDir of versionDirs) {
|
|
246
|
+
if (!activeStoreDirs.has(resolve(versionDir))) {
|
|
247
|
+
await rm(versionDir, { recursive: true, force: true });
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
async cleanupEmptySkillDirectories(workspaceSkillMountDir) {
|
|
255
|
+
try {
|
|
256
|
+
const entries = await readdir(workspaceSkillMountDir);
|
|
257
|
+
if (entries.length === 0) {
|
|
258
|
+
await rm(workspaceSkillMountDir, { recursive: true, force: true });
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
catch {
|
|
262
|
+
return;
|
|
263
|
+
}
|
|
264
|
+
const agentsDir = join(workspaceSkillMountDir, "..");
|
|
265
|
+
try {
|
|
266
|
+
const stat = await lstat(agentsDir);
|
|
267
|
+
if (!stat.isDirectory()) {
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
const entries = await readdir(agentsDir);
|
|
271
|
+
if (entries.length === 0) {
|
|
272
|
+
await rm(agentsDir, { recursive: true, force: true });
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
catch {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
//# sourceMappingURL=skill-sync-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skill-sync-service.js","sourceRoot":"","sources":["../../../src/problem-solving-core/codex/skill-sync-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
interface TaskAbortHandle {
|
|
2
|
+
taskId: string;
|
|
3
|
+
runId: string;
|
|
4
|
+
controller: AbortController;
|
|
5
|
+
}
|
|
6
|
+
export declare class TaskAbortRegistry {
|
|
7
|
+
private readonly handlesByRunId;
|
|
8
|
+
private readonly runIdsByTaskId;
|
|
9
|
+
register(handle: TaskAbortHandle): () => void;
|
|
10
|
+
unregister(runId: string): void;
|
|
11
|
+
cancelRun(runId: string, reason: string): boolean;
|
|
12
|
+
cancelTask(taskId: string, reason: string): {
|
|
13
|
+
runId: string;
|
|
14
|
+
aborted: boolean;
|
|
15
|
+
}[];
|
|
16
|
+
}
|
|
17
|
+
export {};
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
export class TaskAbortRegistry {
|
|
2
|
+
handlesByRunId = new Map();
|
|
3
|
+
runIdsByTaskId = new Map();
|
|
4
|
+
register(handle) {
|
|
5
|
+
this.handlesByRunId.set(handle.runId, handle);
|
|
6
|
+
const runIds = this.runIdsByTaskId.get(handle.taskId) ?? new Set();
|
|
7
|
+
runIds.add(handle.runId);
|
|
8
|
+
this.runIdsByTaskId.set(handle.taskId, runIds);
|
|
9
|
+
return () => {
|
|
10
|
+
this.unregister(handle.runId);
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
unregister(runId) {
|
|
14
|
+
const existing = this.handlesByRunId.get(runId);
|
|
15
|
+
if (!existing) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
this.handlesByRunId.delete(runId);
|
|
19
|
+
const runIds = this.runIdsByTaskId.get(existing.taskId);
|
|
20
|
+
if (!runIds) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
runIds.delete(runId);
|
|
24
|
+
if (runIds.size === 0) {
|
|
25
|
+
this.runIdsByTaskId.delete(existing.taskId);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
cancelRun(runId, reason) {
|
|
29
|
+
const handle = this.handlesByRunId.get(runId);
|
|
30
|
+
if (!handle || handle.controller.signal.aborted) {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
handle.controller.abort(reason);
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
cancelTask(taskId, reason) {
|
|
37
|
+
const runIds = this.runIdsByTaskId.get(taskId);
|
|
38
|
+
if (!runIds || runIds.size === 0) {
|
|
39
|
+
return [];
|
|
40
|
+
}
|
|
41
|
+
const results = [];
|
|
42
|
+
for (const runId of runIds) {
|
|
43
|
+
results.push({
|
|
44
|
+
runId,
|
|
45
|
+
aborted: this.cancelRun(runId, reason)
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
return results;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=task-abort-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-abort-registry.js","sourceRoot":"","sources":["../../../src/task-environment/cancellation/task-abort-registry.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,iBAAiB;IACX,cAAc,GAAG,IAAI,GAAG,EAA2B,CAAC;IACpD,cAAc,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE1D,QAAQ,CAAC,MAAuB;QACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;QAC3E,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE/C,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC,CAAC;IACJ,CAAC;IAEM,UAAU,CAAC,KAAa;QAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,KAAa,EAAE,MAAc;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9C,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,UAAU,CAAC,MAAc,EAAE,MAAc;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,OAAO,GAA0C,EAAE,CAAC;QAC1D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK;gBACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;aACvC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { OptimusConfig, OrchestratorTask } from "../../types.js";
|
|
2
|
+
import { SQLiteTaskStore } from "../storage/sqlite-task-store.js";
|
|
3
|
+
import { TaskAbortRegistry } from "./task-abort-registry.js";
|
|
4
|
+
import { TaskCleanupService } from "./task-cleanup-service.js";
|
|
5
|
+
interface CancelTaskOptions {
|
|
6
|
+
eventId?: string;
|
|
7
|
+
taskId: string;
|
|
8
|
+
reason: string;
|
|
9
|
+
cancelSource: string;
|
|
10
|
+
force?: boolean;
|
|
11
|
+
keepArtifacts?: boolean;
|
|
12
|
+
}
|
|
13
|
+
interface CancelTaskResult {
|
|
14
|
+
task: OrchestratorTask;
|
|
15
|
+
state: "cancel_requested" | "canceled";
|
|
16
|
+
}
|
|
17
|
+
export declare class TaskCancellationService {
|
|
18
|
+
private readonly store;
|
|
19
|
+
private readonly abortRegistry;
|
|
20
|
+
private readonly cleanupService;
|
|
21
|
+
private readonly logger;
|
|
22
|
+
constructor(store: SQLiteTaskStore, abortRegistry: TaskAbortRegistry, cleanupService: TaskCleanupService, config: OptimusConfig);
|
|
23
|
+
requestCancel(options: CancelTaskOptions): Promise<CancelTaskResult | undefined>;
|
|
24
|
+
}
|
|
25
|
+
export {};
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { OptimusLogger } from "../observability/logger.js";
|
|
2
|
+
export class TaskCancellationService {
|
|
3
|
+
store;
|
|
4
|
+
abortRegistry;
|
|
5
|
+
cleanupService;
|
|
6
|
+
logger;
|
|
7
|
+
constructor(store, abortRegistry, cleanupService, config) {
|
|
8
|
+
this.store = store;
|
|
9
|
+
this.abortRegistry = abortRegistry;
|
|
10
|
+
this.cleanupService = cleanupService;
|
|
11
|
+
this.logger = new OptimusLogger(config);
|
|
12
|
+
}
|
|
13
|
+
async requestCancel(options) {
|
|
14
|
+
const task = await this.store.cancelTask(options.taskId, options.eventId);
|
|
15
|
+
if (!task) {
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
if (task.activeRunId) {
|
|
19
|
+
const abortedRuns = this.abortRegistry.cancelTask(task.taskId, options.reason);
|
|
20
|
+
const abortedRunCount = abortedRuns.filter((entry) => entry.aborted).length;
|
|
21
|
+
const forceApplied = options.force === true && abortedRunCount === 0;
|
|
22
|
+
await this.logger.warn(forceApplied ? "task.cancel_forced" : "task.cancel_requested", {
|
|
23
|
+
...(options.eventId ? { eventId: options.eventId } : {}),
|
|
24
|
+
taskId: task.taskId,
|
|
25
|
+
status: task.status,
|
|
26
|
+
activeRunId: task.activeRunId,
|
|
27
|
+
cancelSource: options.cancelSource,
|
|
28
|
+
abortedRunCount,
|
|
29
|
+
force: options.force === true
|
|
30
|
+
});
|
|
31
|
+
return {
|
|
32
|
+
task,
|
|
33
|
+
state: "cancel_requested"
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
await this.logger.info("task.canceled", {
|
|
37
|
+
...(options.eventId ? { eventId: options.eventId } : {}),
|
|
38
|
+
taskId: task.taskId,
|
|
39
|
+
status: task.status,
|
|
40
|
+
cancelSource: options.cancelSource
|
|
41
|
+
});
|
|
42
|
+
await this.cleanupService.cleanupCanceledTask({
|
|
43
|
+
taskId: task.taskId,
|
|
44
|
+
...(options.eventId ? { eventId: options.eventId } : {}),
|
|
45
|
+
cancelSource: options.cancelSource,
|
|
46
|
+
...(options.keepArtifacts === true ? { keepArtifacts: true } : {})
|
|
47
|
+
});
|
|
48
|
+
return {
|
|
49
|
+
task,
|
|
50
|
+
state: "canceled"
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
//# sourceMappingURL=task-cancellation-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-cancellation-service.js","sourceRoot":"","sources":["../../../src/task-environment/cancellation/task-cancellation-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAmB3D,MAAM,OAAO,uBAAuB;IAIf;IACA;IACA;IALF,MAAM,CAAgB;IAEvC,YACmB,KAAsB,EACtB,aAAgC,EAChC,cAAkC,EACnD,MAAqB;QAHJ,UAAK,GAAL,KAAK,CAAiB;QACtB,kBAAa,GAAb,aAAa,CAAmB;QAChC,mBAAc,GAAd,cAAc,CAAoB;QAGnD,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAA0B;QACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAC1E,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/E,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;YAC5E,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,KAAK,IAAI,IAAI,eAAe,KAAK,CAAC,CAAC;YACrE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,uBAAuB,EAAE;gBACpF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,eAAe;gBACf,KAAK,EAAE,OAAO,CAAC,KAAK,KAAK,IAAI;aAC9B,CAAC,CAAC;YACH,OAAO;gBACL,IAAI;gBACJ,KAAK,EAAE,kBAAkB;aAC1B,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE;YACtC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC;YAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACnE,CAAC,CAAC;QACH,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,UAAU;SAClB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { OptimusConfig } from "../../types.js";
|
|
2
|
+
import { SQLiteTaskStore } from "../storage/sqlite-task-store.js";
|
|
3
|
+
interface CleanupOptions {
|
|
4
|
+
eventId?: string;
|
|
5
|
+
taskId: string;
|
|
6
|
+
cancelSource?: string;
|
|
7
|
+
keepArtifacts?: boolean;
|
|
8
|
+
}
|
|
9
|
+
interface CleanupResult {
|
|
10
|
+
keepArtifacts: boolean;
|
|
11
|
+
workspaceRemoved: boolean;
|
|
12
|
+
artifactCount: number;
|
|
13
|
+
durationMs: number;
|
|
14
|
+
}
|
|
15
|
+
export declare class TaskCleanupService {
|
|
16
|
+
private readonly store;
|
|
17
|
+
private readonly config;
|
|
18
|
+
private readonly logger;
|
|
19
|
+
constructor(store: SQLiteTaskStore, config: OptimusConfig);
|
|
20
|
+
cleanupCanceledTask(options: CleanupOptions): Promise<CleanupResult>;
|
|
21
|
+
}
|
|
22
|
+
export {};
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { rm } from "node:fs/promises";
|
|
2
|
+
import { join } from "node:path";
|
|
3
|
+
import { OptimusLogger } from "../observability/logger.js";
|
|
4
|
+
export class TaskCleanupService {
|
|
5
|
+
store;
|
|
6
|
+
config;
|
|
7
|
+
logger;
|
|
8
|
+
constructor(store, config) {
|
|
9
|
+
this.store = store;
|
|
10
|
+
this.config = config;
|
|
11
|
+
this.logger = new OptimusLogger(config);
|
|
12
|
+
}
|
|
13
|
+
async cleanupCanceledTask(options) {
|
|
14
|
+
const startedAt = Date.now();
|
|
15
|
+
if (options.keepArtifacts) {
|
|
16
|
+
const result = {
|
|
17
|
+
keepArtifacts: true,
|
|
18
|
+
workspaceRemoved: false,
|
|
19
|
+
artifactCount: 0,
|
|
20
|
+
durationMs: Date.now() - startedAt
|
|
21
|
+
};
|
|
22
|
+
await this.logger.info("task.cancel_cleanup_completed", {
|
|
23
|
+
...(options.eventId ? { eventId: options.eventId } : {}),
|
|
24
|
+
taskId: options.taskId,
|
|
25
|
+
...(options.cancelSource ? { cancelSource: options.cancelSource } : {}),
|
|
26
|
+
keepArtifacts: result.keepArtifacts,
|
|
27
|
+
workspaceRemoved: result.workspaceRemoved,
|
|
28
|
+
artifactCount: result.artifactCount,
|
|
29
|
+
durationMs: result.durationMs
|
|
30
|
+
});
|
|
31
|
+
return result;
|
|
32
|
+
}
|
|
33
|
+
const artifacts = await this.store.listTaskArtifacts(options.taskId);
|
|
34
|
+
const taskRootDir = join(this.config.storage.rootDir, "workspaces", options.taskId);
|
|
35
|
+
try {
|
|
36
|
+
await rm(taskRootDir, { recursive: true, force: true });
|
|
37
|
+
const result = {
|
|
38
|
+
keepArtifacts: false,
|
|
39
|
+
workspaceRemoved: true,
|
|
40
|
+
artifactCount: artifacts.length,
|
|
41
|
+
durationMs: Date.now() - startedAt
|
|
42
|
+
};
|
|
43
|
+
await this.logger.info("task.cancel_cleanup_completed", {
|
|
44
|
+
...(options.eventId ? { eventId: options.eventId } : {}),
|
|
45
|
+
taskId: options.taskId,
|
|
46
|
+
...(options.cancelSource ? { cancelSource: options.cancelSource } : {}),
|
|
47
|
+
keepArtifacts: result.keepArtifacts,
|
|
48
|
+
workspaceRemoved: result.workspaceRemoved,
|
|
49
|
+
artifactCount: result.artifactCount,
|
|
50
|
+
durationMs: result.durationMs
|
|
51
|
+
});
|
|
52
|
+
return result;
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
await this.logger.error("task.cancel_cleanup_failed", {
|
|
56
|
+
...(options.eventId ? { eventId: options.eventId } : {}),
|
|
57
|
+
taskId: options.taskId,
|
|
58
|
+
...(options.cancelSource ? { cancelSource: options.cancelSource } : {}),
|
|
59
|
+
keepArtifacts: false,
|
|
60
|
+
durationMs: Date.now() - startedAt,
|
|
61
|
+
reason: error instanceof Error ? error.message : "Unknown cancellation cleanup failure"
|
|
62
|
+
});
|
|
63
|
+
throw error;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=task-cleanup-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-cleanup-service.js","sourceRoot":"","sources":["../../../src/task-environment/cancellation/task-cleanup-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { CommitMessageTemplate, CommitMessageTemplateContext } from "./commit-message-template-types.js";
|
|
2
|
+
export declare class BugfixCommitMessageTemplate implements CommitMessageTemplate {
|
|
3
|
+
supports(context: CommitMessageTemplateContext): boolean;
|
|
4
|
+
render(context: CommitMessageTemplateContext): string;
|
|
5
|
+
private buildSubject;
|
|
6
|
+
private buildBodyLines;
|
|
7
|
+
private buildFooterLines;
|
|
8
|
+
private resolveModuleTag;
|
|
9
|
+
private normalizeTitle;
|
|
10
|
+
private limitSubject;
|
|
11
|
+
private sanitizeTagSegment;
|
|
12
|
+
private requiresPermissionFooter;
|
|
13
|
+
}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import { basename } from "node:path";
|
|
2
|
+
const JIRA_REF_PATTERN = /^[A-Z][A-Z0-9_]+-\d+$/u;
|
|
3
|
+
const SUBJECT_LIMIT = 80;
|
|
4
|
+
export class BugfixCommitMessageTemplate {
|
|
5
|
+
supports(context) {
|
|
6
|
+
return context.bundle.taskType === "bugfix";
|
|
7
|
+
}
|
|
8
|
+
render(context) {
|
|
9
|
+
const subject = this.buildSubject(context);
|
|
10
|
+
const bodyLines = this.buildBodyLines(context);
|
|
11
|
+
const footerLines = this.buildFooterLines(context);
|
|
12
|
+
const sections = [subject];
|
|
13
|
+
if (bodyLines.length > 0) {
|
|
14
|
+
sections.push(bodyLines.join("\n"));
|
|
15
|
+
}
|
|
16
|
+
if (footerLines.length > 0) {
|
|
17
|
+
sections.push(footerLines.join("\n"));
|
|
18
|
+
}
|
|
19
|
+
return sections.join("\n\n");
|
|
20
|
+
}
|
|
21
|
+
buildSubject(context) {
|
|
22
|
+
const moduleTag = this.resolveModuleTag(context);
|
|
23
|
+
const title = this.normalizeTitle(context.bundle.summary.title, context.bundle.summary.sourceRef);
|
|
24
|
+
return `[Bugfix][${moduleTag}] ${this.limitSubject(title)}`;
|
|
25
|
+
}
|
|
26
|
+
buildBodyLines(context) {
|
|
27
|
+
const lines = [];
|
|
28
|
+
if (context.bundle.summary.decision) {
|
|
29
|
+
lines.push(`Optimus: ${context.bundle.summary.decision}`);
|
|
30
|
+
}
|
|
31
|
+
const cause = context.bundle.summary.rootCauseConclusion ?? context.bundle.summary.analysisSummary;
|
|
32
|
+
if (cause) {
|
|
33
|
+
lines.push(`Cause: ${cause}`);
|
|
34
|
+
}
|
|
35
|
+
if (context.bundle.summary.validation) {
|
|
36
|
+
lines.push(`Validation: ${context.bundle.summary.validation}`);
|
|
37
|
+
}
|
|
38
|
+
return lines;
|
|
39
|
+
}
|
|
40
|
+
buildFooterLines(context) {
|
|
41
|
+
const lines = [];
|
|
42
|
+
const sourceRef = context.bundle.summary.sourceRef?.trim();
|
|
43
|
+
lines.push(`Jira: ${sourceRef && JIRA_REF_PATTERN.test(sourceRef) ? sourceRef : "N/A"}`);
|
|
44
|
+
if (this.requiresPermissionFooter(context.changedPaths)) {
|
|
45
|
+
lines.push("Permission: N/A");
|
|
46
|
+
}
|
|
47
|
+
return lines;
|
|
48
|
+
}
|
|
49
|
+
resolveModuleTag(context) {
|
|
50
|
+
if (context.target.projectPath && context.target.projectPath !== ".") {
|
|
51
|
+
return this.sanitizeTagSegment(basename(context.target.projectPath));
|
|
52
|
+
}
|
|
53
|
+
if (context.bundle.summary.repo?.trim()) {
|
|
54
|
+
return this.sanitizeTagSegment(context.bundle.summary.repo.trim());
|
|
55
|
+
}
|
|
56
|
+
return "General";
|
|
57
|
+
}
|
|
58
|
+
normalizeTitle(title, sourceRef) {
|
|
59
|
+
const trimmed = title.trim();
|
|
60
|
+
if (!trimmed) {
|
|
61
|
+
return "fix task";
|
|
62
|
+
}
|
|
63
|
+
if (!sourceRef?.trim()) {
|
|
64
|
+
return trimmed;
|
|
65
|
+
}
|
|
66
|
+
const escaped = sourceRef.trim().replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
|
|
67
|
+
return trimmed
|
|
68
|
+
.replace(new RegExp(`^Jira\\s+${escaped}\\s*[-::]?\\s*`, "iu"), "")
|
|
69
|
+
.replace(new RegExp(`^${escaped}\\s*[-::]?\\s*`, "u"), "")
|
|
70
|
+
.trim() || trimmed;
|
|
71
|
+
}
|
|
72
|
+
limitSubject(value) {
|
|
73
|
+
return value.length <= SUBJECT_LIMIT ? value : `${value.slice(0, SUBJECT_LIMIT - 3).trimEnd()}...`;
|
|
74
|
+
}
|
|
75
|
+
sanitizeTagSegment(value) {
|
|
76
|
+
const normalized = value.replace(/[^a-zA-Z0-9._-]+/gu, "-").replace(/^-+|-+$/gu, "");
|
|
77
|
+
return normalized || "General";
|
|
78
|
+
}
|
|
79
|
+
requiresPermissionFooter(changedPaths) {
|
|
80
|
+
return changedPaths.some((path) => /(?:^|\/)AndroidManifest\.xml$/u.test(path));
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
//# sourceMappingURL=bugfix-commit-message-template.js.map
|