syntaur 0.45.0 → 0.46.0
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/.claude-plugin/plugin.json +1 -1
- package/dist/dashboard/server.js +1383 -209
- package/dist/dashboard/server.js.map +1 -1
- package/dist/index.js +2056 -1479
- package/dist/index.js.map +1 -1
- package/dist/launch/index.d.ts +19 -0
- package/dist/launch/index.js +526 -16
- package/dist/launch/index.js.map +1 -1
- package/package.json +1 -1
- package/platforms/SESSION-ID-RESOLUTION.md +41 -4
- package/platforms/claude-code/.claude-plugin/plugin.json +1 -1
- package/platforms/claude-code/hooks/session-cleanup.sh +25 -64
- package/platforms/claude-code/hooks/session-start.sh +35 -109
- package/platforms/claude-code/skills/track-session/SKILL.md +12 -60
- package/platforms/codex/.codex-plugin/plugin.json +1 -1
- package/platforms/codex/skills/track-session/SKILL.md +12 -60
- package/platforms/hermes/plugins/syntaur/__pycache__/__init__.cpython-312.pyc +0 -0
- package/platforms/hermes/plugins/syntaur/__pycache__/boundary.cpython-312.pyc +0 -0
- package/skills/track-session/SKILL.md +12 -60
package/dist/launch/index.js
CHANGED
|
@@ -1989,6 +1989,7 @@ function cloneDefaultConfig() {
|
|
|
1989
1989
|
...DEFAULT_CONFIG,
|
|
1990
1990
|
onboarding: { ...DEFAULT_CONFIG.onboarding },
|
|
1991
1991
|
agentDefaults: { ...DEFAULT_CONFIG.agentDefaults },
|
|
1992
|
+
session: { ...DEFAULT_CONFIG.session },
|
|
1992
1993
|
integrations: { ...DEFAULT_CONFIG.integrations },
|
|
1993
1994
|
backup: DEFAULT_CONFIG.backup ? { ...DEFAULT_CONFIG.backup } : null,
|
|
1994
1995
|
statuses: DEFAULT_CONFIG.statuses ? {
|
|
@@ -3338,6 +3339,11 @@ async function readConfig() {
|
|
|
3338
3339
|
fm["agentDefaults.autoCreateWorktree"]
|
|
3339
3340
|
) ? fm["agentDefaults.autoCreateWorktree"] : DEFAULT_CONFIG.agentDefaults.autoCreateWorktree
|
|
3340
3341
|
},
|
|
3342
|
+
session: {
|
|
3343
|
+
autoTrack: SESSION_AUTO_TRACK_VALUES.includes(
|
|
3344
|
+
fm["session.autoTrack"]
|
|
3345
|
+
) ? fm["session.autoTrack"] : DEFAULT_CONFIG.session.autoTrack
|
|
3346
|
+
},
|
|
3341
3347
|
integrations: {
|
|
3342
3348
|
claudePluginDir: parseOptionalAbsolutePath(
|
|
3343
3349
|
fm["integrations.claudePluginDir"],
|
|
@@ -3437,7 +3443,7 @@ async function updateAgentsConfig(mutation, options = {}) {
|
|
|
3437
3443
|
await writeAgentsConfig(next);
|
|
3438
3444
|
return { previous, next, written: true };
|
|
3439
3445
|
}
|
|
3440
|
-
var DEFAULT_DERIVE_CONFIG, DEFAULT_ASSIGNMENT_TYPES, DEFAULT_CONFIG, AUTO_CREATE_WORKTREE_VALUES, AgentConfigError, DEFAULT_STATUS_COLORS, KNOWN_AGENT_SCALAR_FIELDS, migratedConfigPaths, TerminalConfigError;
|
|
3446
|
+
var DEFAULT_DERIVE_CONFIG, DEFAULT_ASSIGNMENT_TYPES, DEFAULT_CONFIG, AUTO_CREATE_WORKTREE_VALUES, SESSION_AUTO_TRACK_VALUES, AgentConfigError, DEFAULT_STATUS_COLORS, KNOWN_AGENT_SCALAR_FIELDS, migratedConfigPaths, TerminalConfigError;
|
|
3441
3447
|
var init_config2 = __esm({
|
|
3442
3448
|
"src/utils/config.ts"() {
|
|
3443
3449
|
"use strict";
|
|
@@ -3503,6 +3509,9 @@ var init_config2 = __esm({
|
|
|
3503
3509
|
autoApprove: false,
|
|
3504
3510
|
autoCreateWorktree: "ask"
|
|
3505
3511
|
},
|
|
3512
|
+
session: {
|
|
3513
|
+
autoTrack: "all"
|
|
3514
|
+
},
|
|
3506
3515
|
integrations: {
|
|
3507
3516
|
claudePluginDir: null,
|
|
3508
3517
|
codexPluginDir: null,
|
|
@@ -3523,6 +3532,7 @@ var init_config2 = __esm({
|
|
|
3523
3532
|
}
|
|
3524
3533
|
};
|
|
3525
3534
|
AUTO_CREATE_WORKTREE_VALUES = ["skip", "ask", "always"];
|
|
3535
|
+
SESSION_AUTO_TRACK_VALUES = ["all", "workspaces-only", "off"];
|
|
3526
3536
|
AgentConfigError = class extends Error {
|
|
3527
3537
|
};
|
|
3528
3538
|
DEFAULT_STATUS_COLORS = {
|
|
@@ -3946,9 +3956,162 @@ var init_help = __esm({
|
|
|
3946
3956
|
});
|
|
3947
3957
|
|
|
3948
3958
|
// src/dashboard/session-db.ts
|
|
3959
|
+
var session_db_exports = {};
|
|
3960
|
+
__export(session_db_exports, {
|
|
3961
|
+
closeSessionDb: () => closeSessionDb,
|
|
3962
|
+
getSessionDb: () => getSessionDb,
|
|
3963
|
+
initSessionDb: () => initSessionDb,
|
|
3964
|
+
isSessionDbInitialized: () => isSessionDbInitialized,
|
|
3965
|
+
migrateFromMarkdown: () => migrateFromMarkdown,
|
|
3966
|
+
resetSessionDb: () => resetSessionDb
|
|
3967
|
+
});
|
|
3949
3968
|
import Database from "better-sqlite3";
|
|
3950
3969
|
import { resolve as resolve9 } from "path";
|
|
3951
3970
|
import { readdir as readdir5 } from "fs/promises";
|
|
3971
|
+
function initSessionDb(dbPath) {
|
|
3972
|
+
if (db) return db;
|
|
3973
|
+
const finalPath = dbPath ?? resolve9(syntaurRoot(), "syntaur.db");
|
|
3974
|
+
db = new Database(finalPath);
|
|
3975
|
+
db.pragma("journal_mode = WAL");
|
|
3976
|
+
db.exec(SCHEMA_SQL);
|
|
3977
|
+
db.prepare("INSERT OR IGNORE INTO meta (key, value) VALUES (?, ?)").run(
|
|
3978
|
+
"schema_version",
|
|
3979
|
+
SCHEMA_VERSION
|
|
3980
|
+
);
|
|
3981
|
+
const database = db;
|
|
3982
|
+
const runMigrations = database.transaction(() => {
|
|
3983
|
+
const vBeforeV2 = database.prepare("SELECT value FROM meta WHERE key = 'schema_version'").get()?.value;
|
|
3984
|
+
if (vBeforeV2 === "1") {
|
|
3985
|
+
database.exec(`
|
|
3986
|
+
CREATE TABLE sessions_v2 (
|
|
3987
|
+
session_id TEXT PRIMARY KEY,
|
|
3988
|
+
project_slug TEXT,
|
|
3989
|
+
assignment_slug TEXT,
|
|
3990
|
+
agent TEXT NOT NULL,
|
|
3991
|
+
started TEXT NOT NULL,
|
|
3992
|
+
ended TEXT,
|
|
3993
|
+
status TEXT NOT NULL DEFAULT 'active',
|
|
3994
|
+
path TEXT,
|
|
3995
|
+
description TEXT,
|
|
3996
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
3997
|
+
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
|
3998
|
+
);
|
|
3999
|
+
INSERT INTO sessions_v2 SELECT session_id, project_slug, assignment_slug, agent, started, ended, status, path, NULL, created_at, updated_at FROM sessions;
|
|
4000
|
+
DROP TABLE sessions;
|
|
4001
|
+
ALTER TABLE sessions_v2 RENAME TO sessions;
|
|
4002
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_slug);
|
|
4003
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_assignment ON sessions(project_slug, assignment_slug);
|
|
4004
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_status ON sessions(status);
|
|
4005
|
+
UPDATE meta SET value = '2' WHERE key = 'schema_version';
|
|
4006
|
+
`);
|
|
4007
|
+
}
|
|
4008
|
+
const vBeforeV3 = database.prepare("SELECT value FROM meta WHERE key = 'schema_version'").get()?.value;
|
|
4009
|
+
if (vBeforeV3 === "2") {
|
|
4010
|
+
const v2Columns = database.prepare("PRAGMA table_info(sessions)").all();
|
|
4011
|
+
const v2ColNames = v2Columns.map((c) => c.name);
|
|
4012
|
+
const hasProject = v2ColNames.includes("project_slug");
|
|
4013
|
+
const hasMission = v2ColNames.includes("mission_slug");
|
|
4014
|
+
const projectSlugExpr = hasProject && hasMission ? "COALESCE(project_slug, mission_slug)" : hasProject ? "project_slug" : hasMission ? "mission_slug" : null;
|
|
4015
|
+
if (!projectSlugExpr) {
|
|
4016
|
+
throw new Error(
|
|
4017
|
+
"sessions table has neither project_slug nor mission_slug; cannot migrate from v2 to v3"
|
|
4018
|
+
);
|
|
4019
|
+
}
|
|
4020
|
+
database.exec(`
|
|
4021
|
+
CREATE TABLE sessions_v3 (
|
|
4022
|
+
session_id TEXT PRIMARY KEY,
|
|
4023
|
+
project_slug TEXT,
|
|
4024
|
+
assignment_slug TEXT,
|
|
4025
|
+
agent TEXT NOT NULL,
|
|
4026
|
+
started TEXT NOT NULL,
|
|
4027
|
+
ended TEXT,
|
|
4028
|
+
status TEXT NOT NULL DEFAULT 'active',
|
|
4029
|
+
path TEXT,
|
|
4030
|
+
description TEXT,
|
|
4031
|
+
transcript_path TEXT,
|
|
4032
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
4033
|
+
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
|
4034
|
+
);
|
|
4035
|
+
INSERT INTO sessions_v3
|
|
4036
|
+
SELECT session_id, ${projectSlugExpr}, assignment_slug, agent, started, ended, status, path, description, NULL, created_at, updated_at
|
|
4037
|
+
FROM sessions;
|
|
4038
|
+
DROP TABLE sessions;
|
|
4039
|
+
ALTER TABLE sessions_v3 RENAME TO sessions;
|
|
4040
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_slug);
|
|
4041
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_assignment ON sessions(project_slug, assignment_slug);
|
|
4042
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_status ON sessions(status);
|
|
4043
|
+
UPDATE meta SET value = '3' WHERE key = 'schema_version';
|
|
4044
|
+
`);
|
|
4045
|
+
}
|
|
4046
|
+
const vBeforeV4 = database.prepare("SELECT value FROM meta WHERE key = 'schema_version'").get()?.value;
|
|
4047
|
+
if (vBeforeV4 === "3") {
|
|
4048
|
+
database.exec(`
|
|
4049
|
+
CREATE TABLE sessions_v4 (
|
|
4050
|
+
session_id TEXT PRIMARY KEY,
|
|
4051
|
+
project_slug TEXT,
|
|
4052
|
+
assignment_slug TEXT,
|
|
4053
|
+
agent TEXT NOT NULL,
|
|
4054
|
+
started TEXT NOT NULL,
|
|
4055
|
+
ended TEXT,
|
|
4056
|
+
status TEXT NOT NULL DEFAULT 'active',
|
|
4057
|
+
path TEXT,
|
|
4058
|
+
description TEXT,
|
|
4059
|
+
transcript_path TEXT,
|
|
4060
|
+
pid INTEGER,
|
|
4061
|
+
pid_started_at TEXT,
|
|
4062
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
4063
|
+
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
|
4064
|
+
);
|
|
4065
|
+
INSERT INTO sessions_v4
|
|
4066
|
+
SELECT session_id, project_slug, assignment_slug, agent, started, ended, status, path, description, transcript_path, NULL, NULL, created_at, updated_at
|
|
4067
|
+
FROM sessions;
|
|
4068
|
+
DROP TABLE sessions;
|
|
4069
|
+
ALTER TABLE sessions_v4 RENAME TO sessions;
|
|
4070
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_slug);
|
|
4071
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_assignment ON sessions(project_slug, assignment_slug);
|
|
4072
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_status ON sessions(status);
|
|
4073
|
+
UPDATE meta SET value = '4' WHERE key = 'schema_version';
|
|
4074
|
+
`);
|
|
4075
|
+
}
|
|
4076
|
+
const vBeforeV5 = database.prepare("SELECT value FROM meta WHERE key = 'schema_version'").get()?.value;
|
|
4077
|
+
if (vBeforeV5 === "4") {
|
|
4078
|
+
database.exec(`
|
|
4079
|
+
CREATE TABLE sessions_v5 (
|
|
4080
|
+
session_id TEXT PRIMARY KEY,
|
|
4081
|
+
project_slug TEXT,
|
|
4082
|
+
assignment_slug TEXT,
|
|
4083
|
+
agent TEXT NOT NULL,
|
|
4084
|
+
started TEXT NOT NULL,
|
|
4085
|
+
ended TEXT,
|
|
4086
|
+
status TEXT NOT NULL DEFAULT 'active',
|
|
4087
|
+
path TEXT,
|
|
4088
|
+
description TEXT,
|
|
4089
|
+
transcript_path TEXT,
|
|
4090
|
+
pid INTEGER,
|
|
4091
|
+
pid_started_at TEXT,
|
|
4092
|
+
original_head_sha TEXT,
|
|
4093
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
4094
|
+
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
|
4095
|
+
);
|
|
4096
|
+
INSERT INTO sessions_v5
|
|
4097
|
+
SELECT session_id, project_slug, assignment_slug, agent, started, ended, status, path, description, transcript_path, pid, pid_started_at, NULL, created_at, updated_at
|
|
4098
|
+
FROM sessions;
|
|
4099
|
+
DROP TABLE sessions;
|
|
4100
|
+
ALTER TABLE sessions_v5 RENAME TO sessions;
|
|
4101
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_slug);
|
|
4102
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_assignment ON sessions(project_slug, assignment_slug);
|
|
4103
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_status ON sessions(status);
|
|
4104
|
+
UPDATE meta SET value = '5' WHERE key = 'schema_version';
|
|
4105
|
+
`);
|
|
4106
|
+
}
|
|
4107
|
+
});
|
|
4108
|
+
runMigrations.exclusive();
|
|
4109
|
+
db.exec(POST_MIGRATION_INDEXES_SQL);
|
|
4110
|
+
return db;
|
|
4111
|
+
}
|
|
4112
|
+
function isSessionDbInitialized() {
|
|
4113
|
+
return db !== null;
|
|
4114
|
+
}
|
|
3952
4115
|
function getSessionDb() {
|
|
3953
4116
|
if (!db) {
|
|
3954
4117
|
throw new Error(
|
|
@@ -3957,17 +4120,129 @@ function getSessionDb() {
|
|
|
3957
4120
|
}
|
|
3958
4121
|
return db;
|
|
3959
4122
|
}
|
|
3960
|
-
|
|
4123
|
+
function closeSessionDb() {
|
|
4124
|
+
if (db) {
|
|
4125
|
+
db.close();
|
|
4126
|
+
db = null;
|
|
4127
|
+
}
|
|
4128
|
+
}
|
|
4129
|
+
function resetSessionDb() {
|
|
4130
|
+
db = null;
|
|
4131
|
+
}
|
|
4132
|
+
async function migrateFromMarkdown(projectsDir) {
|
|
4133
|
+
const database = getSessionDb();
|
|
4134
|
+
const count = database.prepare("SELECT COUNT(*) as count FROM sessions").get();
|
|
4135
|
+
if (count.count > 0) return 0;
|
|
4136
|
+
if (!await fileExists(projectsDir)) return 0;
|
|
4137
|
+
const entries = await readdir5(projectsDir, { withFileTypes: true });
|
|
4138
|
+
const allSessions = [];
|
|
4139
|
+
for (const entry of entries) {
|
|
4140
|
+
if (!entry.isDirectory()) continue;
|
|
4141
|
+
const projectDir = resolve9(projectsDir, entry.name);
|
|
4142
|
+
const indexPath = resolve9(projectDir, "_index-sessions.md");
|
|
4143
|
+
if (!await fileExists(indexPath)) continue;
|
|
4144
|
+
const sessions = await parseMarkdownSessionsIndex(indexPath, entry.name);
|
|
4145
|
+
allSessions.push(...sessions);
|
|
4146
|
+
}
|
|
4147
|
+
if (allSessions.length === 0) return 0;
|
|
4148
|
+
const insert = database.prepare(`
|
|
4149
|
+
INSERT OR IGNORE INTO sessions (session_id, project_slug, assignment_slug, agent, started, status, path)
|
|
4150
|
+
VALUES (?, ?, ?, ?, ?, ?, ?)
|
|
4151
|
+
`);
|
|
4152
|
+
const insertAll = database.transaction((sessions) => {
|
|
4153
|
+
for (const s of sessions) {
|
|
4154
|
+
insert.run(s.sessionId, s.projectSlug, s.assignmentSlug, s.agent, s.started, s.status, s.path);
|
|
4155
|
+
}
|
|
4156
|
+
});
|
|
4157
|
+
insertAll(allSessions);
|
|
4158
|
+
console.log(`Migrated ${allSessions.length} sessions from markdown to SQLite.`);
|
|
4159
|
+
return allSessions.length;
|
|
4160
|
+
}
|
|
4161
|
+
async function parseMarkdownSessionsIndex(filePath, projectSlug) {
|
|
4162
|
+
const { readFile: readFile12 } = await import("fs/promises");
|
|
4163
|
+
const raw = await readFile12(filePath, "utf-8");
|
|
4164
|
+
const sessions = [];
|
|
4165
|
+
const lines = raw.split("\n");
|
|
4166
|
+
let inTable = false;
|
|
4167
|
+
let headerSeen = false;
|
|
4168
|
+
for (const line of lines) {
|
|
4169
|
+
const trimmed = line.trim();
|
|
4170
|
+
if (!trimmed) continue;
|
|
4171
|
+
if (trimmed.startsWith("| Assignment") || trimmed.startsWith("|Assignment")) {
|
|
4172
|
+
inTable = true;
|
|
4173
|
+
headerSeen = false;
|
|
4174
|
+
continue;
|
|
4175
|
+
}
|
|
4176
|
+
if (inTable && !headerSeen && trimmed.match(/^\|[-\s|]+\|$/)) {
|
|
4177
|
+
headerSeen = true;
|
|
4178
|
+
continue;
|
|
4179
|
+
}
|
|
4180
|
+
if (inTable && headerSeen && trimmed.startsWith("|")) {
|
|
4181
|
+
const cells = trimmed.split("|").slice(1, -1).map((c) => c.trim());
|
|
4182
|
+
if (cells.length >= 6) {
|
|
4183
|
+
sessions.push({
|
|
4184
|
+
assignmentSlug: cells[0],
|
|
4185
|
+
agent: cells[1],
|
|
4186
|
+
sessionId: cells[2],
|
|
4187
|
+
started: cells[3],
|
|
4188
|
+
status: cells[4] || "active",
|
|
4189
|
+
path: cells[5],
|
|
4190
|
+
projectSlug
|
|
4191
|
+
});
|
|
4192
|
+
}
|
|
4193
|
+
}
|
|
4194
|
+
}
|
|
4195
|
+
return sessions;
|
|
4196
|
+
}
|
|
4197
|
+
var db, SCHEMA_VERSION, SCHEMA_SQL, POST_MIGRATION_INDEXES_SQL;
|
|
3961
4198
|
var init_session_db = __esm({
|
|
3962
4199
|
"src/dashboard/session-db.ts"() {
|
|
3963
4200
|
"use strict";
|
|
3964
4201
|
init_paths();
|
|
3965
4202
|
init_fs();
|
|
3966
4203
|
db = null;
|
|
4204
|
+
SCHEMA_VERSION = "5";
|
|
4205
|
+
SCHEMA_SQL = `
|
|
4206
|
+
CREATE TABLE IF NOT EXISTS sessions (
|
|
4207
|
+
session_id TEXT PRIMARY KEY,
|
|
4208
|
+
project_slug TEXT,
|
|
4209
|
+
assignment_slug TEXT,
|
|
4210
|
+
agent TEXT NOT NULL,
|
|
4211
|
+
started TEXT NOT NULL,
|
|
4212
|
+
ended TEXT,
|
|
4213
|
+
status TEXT NOT NULL DEFAULT 'active',
|
|
4214
|
+
path TEXT,
|
|
4215
|
+
description TEXT,
|
|
4216
|
+
transcript_path TEXT,
|
|
4217
|
+
pid INTEGER,
|
|
4218
|
+
pid_started_at TEXT,
|
|
4219
|
+
original_head_sha TEXT,
|
|
4220
|
+
created_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
4221
|
+
updated_at TEXT NOT NULL DEFAULT (datetime('now'))
|
|
4222
|
+
);
|
|
4223
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_status ON sessions(status);
|
|
4224
|
+
CREATE TABLE IF NOT EXISTS meta (key TEXT PRIMARY KEY, value TEXT);
|
|
4225
|
+
`;
|
|
4226
|
+
POST_MIGRATION_INDEXES_SQL = `
|
|
4227
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_project ON sessions(project_slug);
|
|
4228
|
+
CREATE INDEX IF NOT EXISTS idx_sessions_assignment ON sessions(project_slug, assignment_slug);
|
|
4229
|
+
`;
|
|
3967
4230
|
}
|
|
3968
4231
|
});
|
|
3969
4232
|
|
|
3970
4233
|
// src/dashboard/agent-sessions.ts
|
|
4234
|
+
var agent_sessions_exports = {};
|
|
4235
|
+
__export(agent_sessions_exports, {
|
|
4236
|
+
appendSession: () => appendSession,
|
|
4237
|
+
deleteSessions: () => deleteSessions,
|
|
4238
|
+
getSessionById: () => getSessionById,
|
|
4239
|
+
listAllSessions: () => listAllSessions,
|
|
4240
|
+
listProjectSessions: () => listProjectSessions,
|
|
4241
|
+
listSessionsByAssignment: () => listSessionsByAssignment,
|
|
4242
|
+
parseSessionsIndex: () => parseSessionsIndex,
|
|
4243
|
+
reconcileActiveSessions: () => reconcileActiveSessions,
|
|
4244
|
+
updateSessionStatus: () => updateSessionStatus
|
|
4245
|
+
});
|
|
3971
4246
|
import { readFile as readFile8 } from "fs/promises";
|
|
3972
4247
|
import { resolve as resolve10 } from "path";
|
|
3973
4248
|
function rowToSession(row) {
|
|
@@ -3987,16 +4262,151 @@ function rowToSession(row) {
|
|
|
3987
4262
|
originalHeadSha: row.original_head_sha ?? null
|
|
3988
4263
|
};
|
|
3989
4264
|
}
|
|
4265
|
+
async function parseSessionsIndex(_projectDir, projectSlug) {
|
|
4266
|
+
const db2 = getSessionDb();
|
|
4267
|
+
const rows = db2.prepare("SELECT * FROM sessions WHERE project_slug = ? ORDER BY started DESC").all(projectSlug);
|
|
4268
|
+
return rows.map(rowToSession);
|
|
4269
|
+
}
|
|
4270
|
+
async function appendSession(_projectDir, session, opts) {
|
|
4271
|
+
const db2 = getSessionDb();
|
|
4272
|
+
db2.prepare(`
|
|
4273
|
+
INSERT INTO sessions (session_id, project_slug, assignment_slug, agent, started, status, path, description, transcript_path, pid, pid_started_at, original_head_sha)
|
|
4274
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
4275
|
+
ON CONFLICT(session_id) DO UPDATE SET
|
|
4276
|
+
project_slug = COALESCE(NULLIF(excluded.project_slug, ''), project_slug),
|
|
4277
|
+
assignment_slug = COALESCE(NULLIF(excluded.assignment_slug, ''), assignment_slug),
|
|
4278
|
+
agent = excluded.agent,
|
|
4279
|
+
status = CASE
|
|
4280
|
+
WHEN status = 'completed' THEN status
|
|
4281
|
+
WHEN status = 'stopped' AND NOT (? AND excluded.status = 'active') THEN status
|
|
4282
|
+
ELSE excluded.status
|
|
4283
|
+
END,
|
|
4284
|
+
path = COALESCE(NULLIF(excluded.path, ''), path),
|
|
4285
|
+
description = COALESCE(NULLIF(excluded.description, ''), description),
|
|
4286
|
+
transcript_path = COALESCE(NULLIF(excluded.transcript_path, ''), transcript_path),
|
|
4287
|
+
pid = COALESCE(excluded.pid, pid),
|
|
4288
|
+
pid_started_at = COALESCE(NULLIF(excluded.pid_started_at, ''), pid_started_at),
|
|
4289
|
+
original_head_sha = COALESCE(NULLIF(original_head_sha, ''), NULLIF(excluded.original_head_sha, '')),
|
|
4290
|
+
updated_at = datetime('now')
|
|
4291
|
+
`).run(
|
|
4292
|
+
session.sessionId,
|
|
4293
|
+
session.projectSlug ?? null,
|
|
4294
|
+
session.assignmentSlug ?? null,
|
|
4295
|
+
session.agent,
|
|
4296
|
+
session.started,
|
|
4297
|
+
session.status,
|
|
4298
|
+
session.path,
|
|
4299
|
+
session.description ?? null,
|
|
4300
|
+
session.transcriptPath ?? null,
|
|
4301
|
+
session.pid ?? null,
|
|
4302
|
+
session.pidStartedAt ?? null,
|
|
4303
|
+
session.originalHeadSha ?? null,
|
|
4304
|
+
opts?.reviveStopped ? 1 : 0
|
|
4305
|
+
);
|
|
4306
|
+
}
|
|
4307
|
+
async function updateSessionStatus(_projectDir, sessionId, status, endedAt) {
|
|
4308
|
+
const db2 = getSessionDb();
|
|
4309
|
+
const isTerminal = status === "completed" || status === "stopped";
|
|
4310
|
+
const result = isTerminal ? db2.prepare(
|
|
4311
|
+
"UPDATE sessions SET status = ?, ended = COALESCE(?, datetime('now')), updated_at = datetime('now') WHERE session_id = ?"
|
|
4312
|
+
).run(status, endedAt ?? null, sessionId) : db2.prepare(
|
|
4313
|
+
"UPDATE sessions SET status = ?, updated_at = datetime('now') WHERE session_id = ?"
|
|
4314
|
+
).run(status, sessionId);
|
|
4315
|
+
return result.changes > 0;
|
|
4316
|
+
}
|
|
4317
|
+
async function listAllSessions(_projectsDir) {
|
|
4318
|
+
const db2 = getSessionDb();
|
|
4319
|
+
const rows = db2.prepare("SELECT * FROM sessions ORDER BY started DESC").all();
|
|
4320
|
+
return rows.map(rowToSession);
|
|
4321
|
+
}
|
|
3990
4322
|
function getSessionById(sessionId) {
|
|
3991
4323
|
const db2 = getSessionDb();
|
|
3992
4324
|
const row = db2.prepare("SELECT * FROM sessions WHERE session_id = ? LIMIT 1").get(sessionId);
|
|
3993
4325
|
return row ? rowToSession(row) : null;
|
|
3994
4326
|
}
|
|
4327
|
+
async function listProjectSessions(_projectsDir, projectSlug, assignmentSlug) {
|
|
4328
|
+
const db2 = getSessionDb();
|
|
4329
|
+
if (assignmentSlug) {
|
|
4330
|
+
const rows2 = db2.prepare(
|
|
4331
|
+
"SELECT * FROM sessions WHERE project_slug = ? AND assignment_slug = ? ORDER BY started DESC"
|
|
4332
|
+
).all(projectSlug, assignmentSlug);
|
|
4333
|
+
return rows2.map(rowToSession);
|
|
4334
|
+
}
|
|
4335
|
+
const rows = db2.prepare("SELECT * FROM sessions WHERE project_slug = ? ORDER BY started DESC").all(projectSlug);
|
|
4336
|
+
return rows.map(rowToSession);
|
|
4337
|
+
}
|
|
4338
|
+
async function deleteSessions(sessionIds) {
|
|
4339
|
+
if (sessionIds.length === 0) return 0;
|
|
4340
|
+
const db2 = getSessionDb();
|
|
4341
|
+
const placeholders = sessionIds.map(() => "?").join(", ");
|
|
4342
|
+
const result = db2.prepare(`DELETE FROM sessions WHERE session_id IN (${placeholders})`).run(...sessionIds);
|
|
4343
|
+
return result.changes;
|
|
4344
|
+
}
|
|
4345
|
+
async function readAssignmentStatusFromPath(assignmentMdPath) {
|
|
4346
|
+
if (!await fileExists(assignmentMdPath)) return null;
|
|
4347
|
+
const raw = await readFile8(assignmentMdPath, "utf-8");
|
|
4348
|
+
const match = raw.match(/^status:\s*(.+)$/m);
|
|
4349
|
+
return match ? match[1].trim() : null;
|
|
4350
|
+
}
|
|
4351
|
+
async function readAssignmentStatus(projectDir, assignmentSlug) {
|
|
4352
|
+
return readAssignmentStatusFromPath(
|
|
4353
|
+
resolve10(projectDir, "assignments", assignmentSlug, "assignment.md")
|
|
4354
|
+
);
|
|
4355
|
+
}
|
|
4356
|
+
async function reconcileActiveSessions(projectsDir, assignmentsDir) {
|
|
4357
|
+
const db2 = getSessionDb();
|
|
4358
|
+
const activeSessions = db2.prepare("SELECT * FROM sessions WHERE status = 'active' AND assignment_slug IS NOT NULL").all();
|
|
4359
|
+
if (activeSessions.length === 0) return 0;
|
|
4360
|
+
const assignmentStatuses = /* @__PURE__ */ new Map();
|
|
4361
|
+
const seen = /* @__PURE__ */ new Set();
|
|
4362
|
+
for (const session of activeSessions) {
|
|
4363
|
+
const aslug = session.assignment_slug;
|
|
4364
|
+
if (!aslug) continue;
|
|
4365
|
+
const projectKey = session.project_slug ?? "__standalone__";
|
|
4366
|
+
const key = `${projectKey}/${aslug}`;
|
|
4367
|
+
if (seen.has(key)) continue;
|
|
4368
|
+
seen.add(key);
|
|
4369
|
+
if (session.project_slug) {
|
|
4370
|
+
const status = await readAssignmentStatus(
|
|
4371
|
+
resolve10(projectsDir, session.project_slug),
|
|
4372
|
+
aslug
|
|
4373
|
+
);
|
|
4374
|
+
if (status) assignmentStatuses.set(key, status);
|
|
4375
|
+
} else if (assignmentsDir) {
|
|
4376
|
+
const status = await readAssignmentStatusFromPath(
|
|
4377
|
+
resolve10(assignmentsDir, aslug, "assignment.md")
|
|
4378
|
+
);
|
|
4379
|
+
if (status) assignmentStatuses.set(key, status);
|
|
4380
|
+
}
|
|
4381
|
+
}
|
|
4382
|
+
let totalUpdated = 0;
|
|
4383
|
+
for (const session of activeSessions) {
|
|
4384
|
+
const projectKey = session.project_slug ?? "__standalone__";
|
|
4385
|
+
const key = `${projectKey}/${session.assignment_slug}`;
|
|
4386
|
+
const assignmentStatus = assignmentStatuses.get(key);
|
|
4387
|
+
if (!assignmentStatus || !DONE_ASSIGNMENT_STATUSES.has(assignmentStatus)) continue;
|
|
4388
|
+
const newStatus = assignmentStatus === "failed" ? "stopped" : "completed";
|
|
4389
|
+
await updateSessionStatus("", session.session_id, newStatus);
|
|
4390
|
+
totalUpdated++;
|
|
4391
|
+
}
|
|
4392
|
+
return totalUpdated;
|
|
4393
|
+
}
|
|
4394
|
+
async function listSessionsByAssignment(projectSlug, assignmentSlug) {
|
|
4395
|
+
const db2 = getSessionDb();
|
|
4396
|
+
const rows = projectSlug === null ? db2.prepare(
|
|
4397
|
+
"SELECT * FROM sessions WHERE assignment_slug = ? AND project_slug IS NULL ORDER BY started DESC"
|
|
4398
|
+
).all(assignmentSlug) : db2.prepare(
|
|
4399
|
+
"SELECT * FROM sessions WHERE project_slug = ? AND assignment_slug = ? ORDER BY started DESC"
|
|
4400
|
+
).all(projectSlug, assignmentSlug);
|
|
4401
|
+
return rows.map(rowToSession);
|
|
4402
|
+
}
|
|
4403
|
+
var DONE_ASSIGNMENT_STATUSES;
|
|
3995
4404
|
var init_agent_sessions = __esm({
|
|
3996
4405
|
"src/dashboard/agent-sessions.ts"() {
|
|
3997
4406
|
"use strict";
|
|
3998
4407
|
init_fs();
|
|
3999
4408
|
init_session_db();
|
|
4409
|
+
DONE_ASSIGNMENT_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "review"]);
|
|
4000
4410
|
}
|
|
4001
4411
|
});
|
|
4002
4412
|
|
|
@@ -5720,13 +6130,16 @@ async function resolveSessionPlan(input, terminal) {
|
|
|
5720
6130
|
env: process.env,
|
|
5721
6131
|
agentId: agent.id,
|
|
5722
6132
|
fallbackWarning,
|
|
5723
|
-
shellFallbackWarning
|
|
6133
|
+
shellFallbackWarning,
|
|
6134
|
+
// Resume continues the SAME session id; fork mints a new one in-agent.
|
|
6135
|
+
session: { sessionId: (input.mode ?? "resume") === "resume" ? session.sessionId : null }
|
|
5724
6136
|
};
|
|
5725
6137
|
}
|
|
5726
6138
|
|
|
5727
6139
|
// src/launch/execute.ts
|
|
5728
6140
|
import { spawn as spawn3 } from "child_process";
|
|
5729
|
-
import {
|
|
6141
|
+
import { homedir as homedir5 } from "os";
|
|
6142
|
+
import { basename as basename2, join as join5, resolve as resolve14 } from "path";
|
|
5730
6143
|
|
|
5731
6144
|
// src/utils/terminal-probe.ts
|
|
5732
6145
|
import { spawnSync as spawnSync2 } from "child_process";
|
|
@@ -5798,6 +6211,52 @@ function resolveCmuxCli(applicationsDirsOverride, cliDirsOverride, lsappinfoRunn
|
|
|
5798
6211
|
return null;
|
|
5799
6212
|
}
|
|
5800
6213
|
|
|
6214
|
+
// src/launch/execute.ts
|
|
6215
|
+
init_fs();
|
|
6216
|
+
init_config2();
|
|
6217
|
+
|
|
6218
|
+
// src/utils/session-id.ts
|
|
6219
|
+
import { execFileSync as execFileSync2 } from "child_process";
|
|
6220
|
+
import { mkdirSync, readFileSync, statSync as statSync2, writeFileSync } from "fs";
|
|
6221
|
+
import { homedir as homedir4 } from "os";
|
|
6222
|
+
import { dirname as dirname3, join as join4 } from "path";
|
|
6223
|
+
|
|
6224
|
+
// src/utils/process-info.ts
|
|
6225
|
+
import { execFileSync } from "child_process";
|
|
6226
|
+
function captureProcessStartedAt(pid) {
|
|
6227
|
+
if (!Number.isFinite(pid) || pid <= 0) return null;
|
|
6228
|
+
try {
|
|
6229
|
+
const out = execFileSync("ps", ["-o", "lstart=", "-p", String(pid)], {
|
|
6230
|
+
encoding: "utf8",
|
|
6231
|
+
stdio: ["ignore", "pipe", "ignore"]
|
|
6232
|
+
});
|
|
6233
|
+
const trimmed = out.trim();
|
|
6234
|
+
return trimmed === "" ? null : trimmed;
|
|
6235
|
+
} catch {
|
|
6236
|
+
return null;
|
|
6237
|
+
}
|
|
6238
|
+
}
|
|
6239
|
+
|
|
6240
|
+
// src/usage/cwd-extractor.ts
|
|
6241
|
+
init_paths();
|
|
6242
|
+
import { open as open2, readdir as readdir8, stat } from "fs/promises";
|
|
6243
|
+
import { join as join3 } from "path";
|
|
6244
|
+
import { homedir as homedir3 } from "os";
|
|
6245
|
+
|
|
6246
|
+
// src/utils/transcript.ts
|
|
6247
|
+
import { open } from "fs/promises";
|
|
6248
|
+
|
|
6249
|
+
// src/usage/cwd-extractor.ts
|
|
6250
|
+
var TAIL_READ_BYTES = 8 * 1024;
|
|
6251
|
+
var TAIL_READ_BYTES_MAX = 64 * 1024;
|
|
6252
|
+
|
|
6253
|
+
// src/utils/session-id.ts
|
|
6254
|
+
function writeRuntimeMarker(pid, marker, dir) {
|
|
6255
|
+
const path = join4(dir, `${pid}.json`);
|
|
6256
|
+
mkdirSync(dirname3(path), { recursive: true });
|
|
6257
|
+
writeFileSync(path, JSON.stringify(marker));
|
|
6258
|
+
}
|
|
6259
|
+
|
|
5801
6260
|
// src/launch/execute.ts
|
|
5802
6261
|
var TerminalNotFoundError = class extends Error {
|
|
5803
6262
|
terminal;
|
|
@@ -5841,7 +6300,7 @@ async function executeLaunchPlan(plan, spawnFn = realSpawn) {
|
|
|
5841
6300
|
`Spawn failed: ${msg}. Verify the terminal is installed and on PATH.`
|
|
5842
6301
|
);
|
|
5843
6302
|
}
|
|
5844
|
-
await new Promise((
|
|
6303
|
+
await new Promise((resolve16, reject) => {
|
|
5845
6304
|
let settled = false;
|
|
5846
6305
|
let stderr = "";
|
|
5847
6306
|
const finishOk = () => {
|
|
@@ -5851,7 +6310,7 @@ async function executeLaunchPlan(plan, spawnFn = realSpawn) {
|
|
|
5851
6310
|
child.unref();
|
|
5852
6311
|
} catch {
|
|
5853
6312
|
}
|
|
5854
|
-
|
|
6313
|
+
resolve16();
|
|
5855
6314
|
};
|
|
5856
6315
|
const finishErr = (remediation) => {
|
|
5857
6316
|
if (settled) return;
|
|
@@ -5887,6 +6346,57 @@ async function executeLaunchPlan(plan, spawnFn = realSpawn) {
|
|
|
5887
6346
|
});
|
|
5888
6347
|
}
|
|
5889
6348
|
});
|
|
6349
|
+
await registerLaunchAtBirth(plan, child);
|
|
6350
|
+
}
|
|
6351
|
+
async function registerLaunchAtBirth(plan, child) {
|
|
6352
|
+
try {
|
|
6353
|
+
const pid = child.pid;
|
|
6354
|
+
if (!pid) return;
|
|
6355
|
+
const autoTrack = (await readConfig()).session.autoTrack;
|
|
6356
|
+
if (autoTrack === "off") return;
|
|
6357
|
+
const sessionId = plan.session?.sessionId ?? null;
|
|
6358
|
+
const procStart = captureProcessStartedAt(pid);
|
|
6359
|
+
const envDir = process.env.SYNTAUR_RUNTIME_SESSIONS_DIR;
|
|
6360
|
+
const markerDir = envDir && envDir.length > 0 ? envDir : join5(homedir5(), ".syntaur", "runtime", "sessions");
|
|
6361
|
+
writeRuntimeMarker(
|
|
6362
|
+
pid,
|
|
6363
|
+
{
|
|
6364
|
+
...sessionId ? { sessionId } : {},
|
|
6365
|
+
agent: plan.agentId,
|
|
6366
|
+
cwd: plan.cwd,
|
|
6367
|
+
...procStart ? { procStart } : {},
|
|
6368
|
+
writtenAt: Date.now()
|
|
6369
|
+
},
|
|
6370
|
+
markerDir
|
|
6371
|
+
);
|
|
6372
|
+
if (!sessionId) return;
|
|
6373
|
+
if (autoTrack === "workspaces-only" && !await fileExists(resolve14(plan.cwd, ".syntaur", "context.json"))) {
|
|
6374
|
+
return;
|
|
6375
|
+
}
|
|
6376
|
+
const { initSessionDb: initSessionDb2 } = await Promise.resolve().then(() => (init_session_db(), session_db_exports));
|
|
6377
|
+
const { appendSession: appendSession2 } = await Promise.resolve().then(() => (init_agent_sessions(), agent_sessions_exports));
|
|
6378
|
+
initSessionDb2();
|
|
6379
|
+
await appendSession2(
|
|
6380
|
+
"",
|
|
6381
|
+
{
|
|
6382
|
+
sessionId,
|
|
6383
|
+
projectSlug: null,
|
|
6384
|
+
assignmentSlug: null,
|
|
6385
|
+
agent: plan.agentId,
|
|
6386
|
+
started: (/* @__PURE__ */ new Date()).toISOString(),
|
|
6387
|
+
status: "active",
|
|
6388
|
+
path: plan.cwd,
|
|
6389
|
+
description: null,
|
|
6390
|
+
transcriptPath: null,
|
|
6391
|
+
pid,
|
|
6392
|
+
pidStartedAt: procStart,
|
|
6393
|
+
originalHeadSha: null
|
|
6394
|
+
},
|
|
6395
|
+
// Resuming a stopped session IS live-process evidence — we just spawned it.
|
|
6396
|
+
{ reviveStopped: true }
|
|
6397
|
+
);
|
|
6398
|
+
} catch {
|
|
6399
|
+
}
|
|
5890
6400
|
}
|
|
5891
6401
|
var CMUX_BUNDLE_ID = "com.cmuxterm.app";
|
|
5892
6402
|
var CMUX_READINESS_MAX_MS = 20 * 250;
|
|
@@ -6036,8 +6546,8 @@ function appleScriptString(value) {
|
|
|
6036
6546
|
init_paths();
|
|
6037
6547
|
init_fs();
|
|
6038
6548
|
import { fileURLToPath } from "url";
|
|
6039
|
-
import { dirname as
|
|
6040
|
-
import { realpathSync, readFileSync, mkdirSync } from "fs";
|
|
6549
|
+
import { dirname as dirname4, resolve as resolve15, join as join6 } from "path";
|
|
6550
|
+
import { realpathSync, readFileSync as readFileSync2, mkdirSync as mkdirSync2 } from "fs";
|
|
6041
6551
|
var NPX_PATTERNS = [
|
|
6042
6552
|
{ kind: "npm", re: /\/_npx\/([^/]+)\/node_modules(?:\/|$)/ },
|
|
6043
6553
|
{ kind: "pnpm", re: /\/pnpm\/dlx\/([^/]+)\/node_modules(?:\/|$)/ },
|
|
@@ -6062,7 +6572,7 @@ function normalizeSlashes(p) {
|
|
|
6062
6572
|
}
|
|
6063
6573
|
function detectInstallKind(scriptUrl, opts = {}) {
|
|
6064
6574
|
const realpath = opts.realpath ?? realpathSync.native;
|
|
6065
|
-
const readFile12 = opts.readFile ?? ((p) =>
|
|
6575
|
+
const readFile12 = opts.readFile ?? ((p) => readFileSync2(p, "utf-8"));
|
|
6066
6576
|
const ua = opts.envUserAgent !== void 0 ? opts.envUserAgent : process.env.npm_config_user_agent ?? "";
|
|
6067
6577
|
const resolved = resolveScriptPath(scriptUrl, realpath);
|
|
6068
6578
|
if (resolved === null) {
|
|
@@ -6078,14 +6588,14 @@ function detectInstallKind(scriptUrl, opts = {}) {
|
|
|
6078
6588
|
if (GLOBAL_PATTERN.test(norm)) {
|
|
6079
6589
|
return "global";
|
|
6080
6590
|
}
|
|
6081
|
-
let dir =
|
|
6591
|
+
let dir = dirname4(resolved);
|
|
6082
6592
|
for (let depth = 0; depth < 8; depth++) {
|
|
6083
|
-
const pkgJsonPath =
|
|
6593
|
+
const pkgJsonPath = join6(dir, "package.json");
|
|
6084
6594
|
let raw;
|
|
6085
6595
|
try {
|
|
6086
6596
|
raw = readFile12(pkgJsonPath);
|
|
6087
6597
|
} catch {
|
|
6088
|
-
const parent2 =
|
|
6598
|
+
const parent2 = dirname4(dir);
|
|
6089
6599
|
if (parent2 === dir) break;
|
|
6090
6600
|
dir = parent2;
|
|
6091
6601
|
continue;
|
|
@@ -6097,7 +6607,7 @@ function detectInstallKind(scriptUrl, opts = {}) {
|
|
|
6097
6607
|
}
|
|
6098
6608
|
} catch {
|
|
6099
6609
|
}
|
|
6100
|
-
const parent =
|
|
6610
|
+
const parent = dirname4(dir);
|
|
6101
6611
|
if (parent === dir) break;
|
|
6102
6612
|
dir = parent;
|
|
6103
6613
|
}
|
|
@@ -6115,20 +6625,20 @@ function extractNpxHash(scriptUrl, opts = {}) {
|
|
|
6115
6625
|
return null;
|
|
6116
6626
|
}
|
|
6117
6627
|
function nudgeStampDir() {
|
|
6118
|
-
return
|
|
6628
|
+
return resolve15(syntaurRoot(), "npx-handler-nudge");
|
|
6119
6629
|
}
|
|
6120
6630
|
function sanitizeHash(hash) {
|
|
6121
6631
|
return hash.replace(/[^A-Za-z0-9_-]/g, "_") || "_";
|
|
6122
6632
|
}
|
|
6123
6633
|
function nudgeStampPath(hash) {
|
|
6124
|
-
return
|
|
6634
|
+
return join6(nudgeStampDir(), sanitizeHash(hash));
|
|
6125
6635
|
}
|
|
6126
6636
|
async function hasNudgedHash(hash) {
|
|
6127
6637
|
return fileExists(nudgeStampPath(hash));
|
|
6128
6638
|
}
|
|
6129
6639
|
async function recordNudge(hash) {
|
|
6130
6640
|
try {
|
|
6131
|
-
|
|
6641
|
+
mkdirSync2(nudgeStampDir(), { recursive: true });
|
|
6132
6642
|
} catch {
|
|
6133
6643
|
}
|
|
6134
6644
|
try {
|