Skip to content

fix(cursor-worker): un nom de machine Cursor par dépôt #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobdivx merged 1 commit into from
Oct 22, 2026
Merged

fix(cursor-worker): un nom de machine Cursor par dépôt #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 91 additions & 9 deletions apps/server/src/cursor_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,64 @@ pub fn build_repo_worker_args(name: &str, dir: &str, data_dir: &str) -> Vec<Stri
args
}

/// Nom du dépôt servi (dernier segment du remote `origin`, sinon du dossier).
pub fn repo_label(remote: Option<&str>, path: &str) -> String {
let from_remote = remote
.map(|r| r.trim().trim_end_matches('/').trim_end_matches(".git"))
.and_then(|r| r.rsplit(['/', ':']).next())
.map(slug_name)
.filter(|s| !s.is_empty());
from_remote
.or_else(|| {
Path::new(path.trim_end_matches('/'))
.file_name()
.and_then(|s| s.to_str())
.map(slug_name)
.filter(|s| !s.is_empty())
})
.unwrap_or_else(|| "repo".into())
}

/// Un nom de machine Cursor par dépôt : `<nom>-<dépôt>`.
///
/// Le CLI mémorise l'identifiant du worker par nom affiché
/// (`workerIdsByDisplayName` dans son HOME) : des process qui partagent un
/// nom partagent donc le même workerId, et Cursor confie la session à
/// n'importe lequel d'entre eux. Un nom distinct par dépôt donne un workerId
/// distinct et une cible explicite (`worker=devforge-template-studio`).
pub fn repo_worker_names_from(base: &str, labels: &[String]) -> Vec<String> {
let base = slug_name(base);
let mut seen: Vec<String> = Vec::with_capacity(labels.len());
for label in labels {
let raw = if base.is_empty() {
label.clone()
} else {
format!("{base}-{label}")
};
let mut name = slug_name(&raw);
if name.is_empty() {
name = "repo".into();
}
let mut candidate = name.clone();
let mut n = 2;
while seen.contains(&candidate) {
candidate = format!("{name}-{n}");
n += 1;
}
seen.push(candidate);
}
seen
}

/// Noms de machine des dépôts servis (lit le remote `origin` de chaque dossier).
pub fn repo_worker_names(base: &str, workdirs: &[String]) -> Vec<String> {
let labels: Vec<String> = workdirs
.iter()
.map(|d| repo_label(read_git_remote(Path::new(d)).as_deref(), d))
.collect();
repo_worker_names_from(base, &labels)
}

/// Workdirs effectifs : repos éligibles, sinon un espace vide géré par DevForge
/// (le worker démarre quand même et les repos s'ajoutent au prochain relancement).
pub fn workdirs_or_fallback(paths: &[String]) -> Vec<String> {
Expand Down Expand Up @@ -627,15 +685,30 @@ command -v agent >/dev/null 2>&1 || {{ echo "CLI agent absent"; exit 5; }}
SETSID=""
command -v setsid >/dev/null 2>&1 && SETSID="setsid"
K={key}
# Un nom de machine par dépôt (<nom>-<dépôt>) : le CLI associe le workerId au nom.
SEEN=" "
dfname() {{
r=$(git -C "$1" remote get-url origin 2>/dev/null)
r=${{r%/}}; r=${{r%.git}}; r=${{r##*/}}; r=${{r##*:}}
[ -n "$r" ] || r=$(basename "$1")
n=$(printf '%s-%s' {name} "$r" | tr 'A-Z' 'a-z' | tr -cs 'a-z0-9' '-' | sed 's/^-*//; s/-*$//' | cut -c1-48)
[ -n "$n" ] || n=repo
c="$n"; i=2
while case "$SEEN" in *" $c "*) true;; *) false;; esac; do c="$n-$i"; i=$((i+1)); done
SEEN="$SEEN$c "
DFN="$c"
}}
FIRST="$1"; shift
# Un process par dépôt : le CLI exécute chaque session dans son premier --worker-dir.
CURSOR_API_KEY="$K" $SETSID nohup agent worker --name {name} --worker-dir "$FIRST" --management-addr {mgmt} start </dev/null >"$D/worker.out" 2>"$D/worker.err" &
dfname "$FIRST" 2>/dev/null; echo "DF_NAME=$DFN"
CURSOR_API_KEY="$K" $SETSID nohup agent worker --name "$DFN" --worker-dir "$FIRST" --management-addr {mgmt} start </dev/null >"$D/worker.out" 2>"$D/worker.err" &
echo $! >"$PIDF"
I=1
for d in "$@"; do
S="$D/repos/$I"
mkdir -p "$S/data"
CURSOR_API_KEY="$K" $SETSID nohup agent worker --name {name} --worker-dir "$d" --data-dir "$S/data" start </dev/null >"$S/worker.out" 2>"$S/worker.err" &
dfname "$d" 2>/dev/null; echo "DF_NAME=$DFN"
CURSOR_API_KEY="$K" $SETSID nohup agent worker --name "$DFN" --worker-dir "$d" --data-dir "$S/data" start </dev/null >"$S/worker.out" 2>"$S/worker.err" &
echo $! >"$S/worker.pid"
I=$((I+1))
done
Expand Down Expand Up @@ -719,6 +792,8 @@ pub struct ScriptReport {
pub dirs: Vec<String>,
/// Process actifs (un par dépôt) après démarrage.
pub repos_up: Option<u32>,
/// Noms de machine Cursor (un par dépôt) annoncés au démarrage.
pub names: Vec<String>,
pub logs: String,
}

Expand Down Expand Up @@ -748,6 +823,7 @@ pub fn parse_script_output(out: &str) -> ScriptReport {
"DF_READY" => r.ready = Some(v == "1"),
"DF_DIR" => r.dirs.push(v.to_string()),
"DF_REPOS_UP" => r.repos_up = v.parse().ok(),
"DF_NAME" if !v.is_empty() => r.names.push(v.to_string()),
"DF_STOPPED" | "DF_AGENT" | "DF_VERSION" => {}
_ => logs.push(line),
}
Expand Down Expand Up @@ -879,7 +955,8 @@ fn stop_repo_workers() -> Vec<u32> {

/// État par dépôt servi : le premier est le worker principal, les autres ont
/// chacun leur process.
pub fn repo_workers_state(registered: &[String]) -> Vec<Value> {
pub fn repo_workers_state(base_name: &str, registered: &[String]) -> Vec<Value> {
let names = repo_worker_names(base_name, registered);
registered
.iter()
.enumerate()
Expand All @@ -891,6 +968,7 @@ pub fn repo_workers_state(registered: &[String]) -> Vec<Value> {
};
json!({
"path": path,
"name": names.get(i),
"primary": i == 0,
"running": pid.is_some(),
"pid": pid,
Expand Down Expand Up @@ -1053,21 +1131,22 @@ pub fn start_named(
}
ensure_state_dir()?;
let workdirs = workdirs_or_fallback(workdirs);
let args = build_worker_args(name, &workdirs[..1])?;
let names = repo_worker_names(name, &workdirs);
let args = build_worker_args(&names[0], &workdirs[..1])?;
let pid = spawn_worker_process(bin, &args, &out_path(), &err_path(), api_key.as_deref())?;
std::fs::write(pid_path(), pid.to_string()).map_err(|e| e.to_string())?;
save_registered(&workdirs)?;

let mut extra: Vec<(String, u32)> = Vec::new();
let mut extra_errors: Vec<String> = Vec::new();
for dir in workdirs.iter().skip(1) {
for (dir, repo_name) in workdirs.iter().zip(names.iter()).skip(1) {
let slot = repo_slot_dir(dir);
let data = slot.join("data");
if let Err(e) = std::fs::create_dir_all(&data) {
extra_errors.push(format!("{dir} : {e}"));
continue;
}
let args = build_repo_worker_args(name, dir, &data.display().to_string());
let args = build_repo_worker_args(repo_name, dir, &data.display().to_string());
match spawn_worker_process(
bin,
&args,
Expand Down Expand Up @@ -1111,10 +1190,13 @@ pub fn start_named(
"binary": bin.display().to_string(),
"workdirs": workdirs,
"workdirs_count": workdirs.len(),
"machine_names": names,
"processes": 1 + extra.len(),
"repo_errors": extra_errors,
"message": if extra_errors.is_empty() {
format!("Worker « {name} » démarré : {serving} repo(s), un process par repo")
format!(
"Worker démarré : {serving} repo(s), une machine Cursor par dépôt ({name}-<dépôt>)"
)
} else {
format!(
"Worker « {name} » démarré : {serving}/{} repo(s) actifs",
Expand Down Expand Up @@ -1158,7 +1240,7 @@ pub async fn status_json(pool: &PgPool, node_name: &str) -> Result<Value, String
};
let key_invalid = key.is_some() && logs_show_invalid_key(&logs);
let registered = load_registered();
let repo_workers = repo_workers_state(&registered);
let repo_workers = repo_workers_state(&name, &registered);
let repos_up = repo_workers
.iter()
.filter(|w| w["running"].as_bool() == Some(true))
Expand Down Expand Up @@ -1366,7 +1448,7 @@ pub fn status_hint(cli: bool, key: bool, running: bool, ready: Option<bool>) ->
} else if ready == Some(false) {
"Worker démarré, connexion à Cursor en cours."
} else {
"Worker connecté : choisis cette machine dans Cursor (My Machines) ou Grok Bot (worker=<nom>)."
"Worker connecté : une machine par dépôt. Dans Cursor (My Machines) ou Grok Bot, choisis <nom>-<dépôt> (ex. worker=<nom>-mon-depot)."
}
}

Expand Down
6 changes: 5 additions & 1 deletion apps/server/src/cursor_worker_routes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,10 @@ async fn install(
"name": name,
"steps": steps,
"message": if ok {
format!("Worker « {name} » installé et démarré sur {}", node.name)
format!(
"Worker installé et démarré sur {} : une machine Cursor par dépôt ({name}-<dépôt>)",
node.name
)
} else if key_invalid {
cursor_worker::INVALID_KEY_HINT.to_string()
} else {
Expand Down Expand Up @@ -687,6 +690,7 @@ async fn start_on(
"running": rep.running,
"pid": rep.pid,
"name": name,
"machine_names": rep.names,
"workdirs_count": rep.dirs.len(),
"message": format!("Worker « {name} » démarré sur {}", node.name),
}))
Expand Down
109 changes: 106 additions & 3 deletions apps/server/src/cursor_worker_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,35 @@ fn scripts_run_end_to_end_with_fake_agent() {
let repo = tmp.join("repo a");
std::fs::create_dir_all(repo.join(".git")).unwrap();
let repo_b = tmp.join("repo-b");
std::fs::create_dir_all(repo_b.join(".git")).unwrap();
std::fs::create_dir_all(&repo_b).unwrap();
// Vrai dépôt : le nom de machine vient du remote `origin`.
let git_ok = std::process::Command::new("git")
.arg("-C")
.arg(&repo_b)
.args(["init", "-q"])
.status()
.map(|s| s.success())
.unwrap_or(false)
&& std::process::Command::new("git")
.arg("-C")
.arg(&repo_b)
.args([
"remote",
"add",
"origin",
"https://github.com/o/Template-Studio.git",
])
.status()
.map(|s| s.success())
.unwrap_or(false);
if !git_ok {
std::fs::create_dir_all(repo_b.join(".git")).unwrap();
}
let name_b = if git_ok {
"demo-template-studio"
} else {
"demo-repo-b"
};
let base = ScriptBase::Literal(base_dir.display().to_string());

let run = |script: &str| {
Expand Down Expand Up @@ -209,13 +237,15 @@ fn scripts_run_end_to_end_with_fake_agent() {
// Un process par dépôt : le principal sert UNIQUEMENT le premier dépôt.
assert_eq!(r.repos_up, Some(2));
let log = std::fs::read_to_string(base_dir.join("worker.out")).unwrap();
assert!(log.contains("--name demo"));
// Un nom de machine par dépôt (sinon tous partagent le même workerId).
assert!(log.contains("--name demo-repo-a "), "{log}");
assert_eq!(r.names, vec!["demo-repo-a".to_string(), name_b.to_string()]);
assert!(log.contains(&format!("--worker-dir {}", repo.display())));
assert!(!log.contains("repo-b"), "{log}");
assert!(log.contains("--management-addr"));
assert!(!log.contains("key_0123456789abcdef"));
let log_b = std::fs::read_to_string(base_dir.join("repos/1/worker.out")).unwrap();
assert!(log_b.contains("--name demo"), "{log_b}");
assert!(log_b.contains(&format!("--name {name_b} ")), "{log_b}");
assert!(log_b.contains(&format!("--worker-dir {}", repo_b.display())));
assert!(log_b.contains("--data-dir"));
assert!(!log_b.contains("--management-addr"));
Expand Down Expand Up @@ -395,3 +425,76 @@ fn git_remote_is_redacted() {
assert_eq!(r, "https://***@github.com/o/r.git");
let _ = std::fs::remove_dir_all(&tmp);
}

#[test]
fn one_machine_name_per_repo() {
assert_eq!(
repo_label(
Some("https://***@github.com/bobdivx/template-studio.git"),
"/data/x/02792add"
),
"template-studio"
);
assert_eq!(repo_label(Some("git@github.com:o/Repo.git"), "/x"), "repo");
assert_eq!(
repo_label(None, "/data/devforge/applications/jeser"),
"jeser"
);
assert_eq!(repo_label(Some(""), "/"), "repo");
let names = repo_worker_names_from(
"DevForge",
&[
"vigie".into(),
"template-studio".into(),
"jeser".into(),
"jeser".into(),
],
);
assert_eq!(
names,
vec![
"devforge-vigie",
"devforge-template-studio",
"devforge-jeser",
"devforge-jeser-2"
]
);
// Tous distincts : c'est ce qui donne un workerId par dépôt.
let mut d = names.clone();
d.dedup();
assert_eq!(d.len(), names.len());
assert_eq!(repo_worker_names_from("", &["a".into()]), vec!["a"]);
}

#[cfg(unix)]
#[test]
fn repo_worker_names_read_origin_remote() {
let tmp = std::env::temp_dir().join(format!("cw-names-{}", std::process::id()));
let _ = std::fs::remove_dir_all(&tmp);
let a = tmp.join("02792add-bf8d");
std::fs::create_dir_all(&a).unwrap();
let ok = std::process::Command::new("git")
.arg("-C")
.arg(&a)
.args(["init", "-q"])
.status()
.map(|s| s.success())
.unwrap_or(false);
if !ok {
return;
}
std::process::Command::new("git")
.arg("-C")
.arg(&a)
.args([
"remote",
"add",
"origin",
"https://x-access-token:ghp_FAKE@github.com/bobdivx/template-studio.git",
])
.status()
.unwrap();
let names = repo_worker_names("devforge", &[a.display().to_string()]);
assert_eq!(names, vec!["devforge-template-studio"]);
let _ = std::fs::remove_dir_all(&tmp);
}
23 changes: 21 additions & 2 deletions apps/web/src/components/CursorWorkerSettingsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,8 +592,8 @@ function InstallModal({
) : null}
{result.ok ? (
<p class="text-xs text-[var(--color-ink-muted)]">
Dans Cursor (My Machines) ou Grok Bot, choisis la machine{' '}
<code class="text-xs">{result.name}</code>.
Une machine par dépôt : dans Cursor (My Machines) ou Grok Bot, choisis{' '}
<code class="text-xs">{result.name}-&lt;dépôt&gt;</code> (détail dans « Statut »).
</p>
) : null}
</div>
Expand Down Expand Up @@ -817,6 +817,25 @@ function StatusModal({
} (un process par dépôt)`}
/>
) : null}
{status.repo_workers?.length ? (
<Row
label="Machines Cursor"
value={
<ul class="space-y-0.5">
{status.repo_workers.map((w) => (
<li key={w.path} class="flex items-center gap-1.5">
<span
class={w.running ? 'text-[var(--color-ok)]' : 'text-[var(--color-danger)]'}
>
●
</span>
<code class="text-xs">{w.name || w.path}</code>
</li>
))}
</ul>
}
/>
) : null}
<Row
label="CLI Cursor"
value={status.cli_installed ? status.cli_version || 'installé' : 'non installé'}
Expand Down
9 changes: 8 additions & 1 deletion apps/web/src/lib/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,14 @@ export type CursorWorkerStatus = {
registered_paths?: string[];
/** Process actifs (un par dépôt servi) ; null si le worker est arrêté. */
repos_up?: number | null;
repo_workers?: Array<{ path: string; primary: boolean; running: boolean; pid: number | null }>;
/** Un process et une machine Cursor (`<nom>-<dépôt>`) par dépôt servi. */
repo_workers?: Array<{
path: string;
name?: string | null;
primary: boolean;
running: boolean;
pid: number | null;
}>;
logs_tail: string;
hint: string;
};
Expand Down
Loading
Loading