Skip to content

Commit f09190d

Browse files
fix(identity): use exact IDs in generated driver argv
agent-identity: dev3.direct.omp.2ahzpbs3 agent-persona: generalist agent-supervisor: unavailable agent-tool: OMP agent-tool-version: 18.1.2 agent-runtime: OMP 18.1.2 tooling-profile: dotfiles@7534055
1 parent bfdcd8b commit f09190d

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/claude_session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn development_channel_argv(
111111
catalog_root,
112112
"driver",
113113
"claude-mcp",
114-
"--identity",
114+
"--id",
115115
identity
116116
]
117117
}
@@ -722,7 +722,7 @@ mod tests {
722722
"/var/lib/st2/catalog",
723723
"driver",
724724
"claude-mcp",
725-
"--identity",
725+
"--id",
726726
"host.worker"
727727
])
728728
);

tests/driver_expansion.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ fn pi_deliver_wraps_the_authored_launch_without_rendering_anything() {
116116
catalog.to_string_lossy().into_owned(),
117117
"driver".into(),
118118
"pi-session".into(),
119-
"--identity".into(),
119+
"--id".into(),
120120
"h.worker".into(),
121121
"--runtime-id".into(),
122122
"h.worker".into(),
@@ -253,7 +253,7 @@ fn claude_driver_uses_the_packaged_channel_without_project_mcp_state() {
253253
catalog_string.as_str(),
254254
"driver",
255255
"claude-session",
256-
"--identity",
256+
"--id",
257257
"h.worker",
258258
"--runtime-id",
259259
"h.worker",
@@ -371,7 +371,7 @@ fn legacy_claude_shell_launch_keeps_its_source_under_the_session_wrapper() {
371371
[
372372
"driver",
373373
"claude-session",
374-
"--identity",
374+
"--id",
375375
"h.worker",
376376
"--runtime-id",
377377
"h.worker",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
render {
22
json-upsert ".claude/settings.local.json" "{\n \"$schema\": \"https://json.schemastore.org/claude-code-settings.json\",\n \"hooks\": {\n \"PermissionRequest\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" PermissionRequest\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"PostCompact\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" PostCompact\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"PostToolUse\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" PostToolUse\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"PreCompact\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-pre-compact.sh\\\"\",\n \"type\": \"command\"\n },\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" PreCompact\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"PreToolUse\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" PreToolUse\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"SessionStart\": [\n {\n \"hooks\": [\n {\n \"async\": true,\n \"asyncRewake\": true,\n \"command\": \"\\\"$ST_HOOKS/claude-session-start.sh\\\"\",\n \"type\": \"command\"\n },\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" SessionStart\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"Stop\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" Stop\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"StopFailure\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-stop-failure.sh\\\"\",\n \"type\": \"command\"\n },\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" StopFailure\",\n \"type\": \"command\"\n }\n ]\n }\n ],\n \"UserPromptSubmit\": [\n {\n \"hooks\": [\n {\n \"command\": \"\\\"$ST_HOOKS/claude-observe.sh\\\" UserPromptSubmit\",\n \"type\": \"command\"\n }\n ]\n }\n ]\n },\n \"statusLine\": {\n \"command\": \"\\\"$ST_HOOKS/claude-statusline.sh\\\"\",\n \"padding\": 0,\n \"refreshInterval\": 5,\n \"type\": \"command\"\n }\n}" arrays=union
33
}
4-
argv st2 --catalog $CATALOG driver claude-session --identity Silber.fabric --runtime-id Silber.fabric -- claude --model opus --effort xhigh --channels plugin:st2-channel@st2 --permission-mode bypassPermissions --model override "Start the assigned work."
4+
argv st2 --catalog $CATALOG driver claude-session --id Silber.fabric --runtime-id Silber.fabric -- claude --model opus --effort xhigh --channels plugin:st2-channel@st2 --permission-mode bypassPermissions --model override "Start the assigned work."
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
argv st2 --catalog $CATALOG driver codex --identity host.worker --runtime-id host.worker -- codex --model gpt-5.6-sol -c "model_reasoning_effort=xhigh" --dangerously-bypass-approvals-and-sandbox --model override "Start the assigned work."
1+
argv st2 --catalog $CATALOG driver codex --id host.worker --runtime-id host.worker -- codex --model gpt-5.6-sol -c "model_reasoning_effort=xhigh" --dangerously-bypass-approvals-and-sandbox --model override "Start the assigned work."

tests/fixtures/driver/omp.out.kdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
argv st2 --catalog $CATALOG driver omp-session --identity host.worker --runtime-id host.worker -- omp --model "opencode-go/gpt-5.6-luna" --thinking high --tools read,bash,edit,write "Start the assigned work."
1+
argv st2 --catalog $CATALOG driver omp-session --id host.worker --runtime-id host.worker -- omp --model "opencode-go/gpt-5.6-luna" --thinking high --tools read,bash,edit,write "Start the assigned work."

tests/fixtures/driver/pi.out.kdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
argv st2 --catalog $CATALOG driver pi-session --identity host.worker --runtime-id host.worker -- pi -a --model "anthropic/claude-opus-5" --thinking high --tools read,bash,edit,write "Start the assigned work."
1+
argv st2 --catalog $CATALOG driver pi-session --id host.worker --runtime-id host.worker -- pi -a --model "anthropic/claude-opus-5" --thinking high --tools read,bash,edit,write "Start the assigned work."

0 commit comments

Comments
 (0)