Skip to content

Commit cd5c295

Browse files
committed
Say approvals add or replace by what Basecamp enables for the agent's kind
Basecamp will let team agents add connections too, behind their own switch (bc3 #13840), so the help, README, rollout doc and connect skill no longer say shared agents always replace. The CLI can't see the server's switches, so the copy says what each approval does under either.
1 parent 13109a9 commit cd5c295

6 files changed

Lines changed: 21 additions & 19 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ basecamp connect -P my-agent # the watcher
271271
```
272272

273273
An approval may add a connection or replace an existing one: read the approval
274-
page before proceeding. Personal agents can have several connections when
275-
Basecamp enables adding them. Otherwise, and always for shared agents, a new
274+
page before proceeding. Personal and team agents can have several connections
275+
where Basecamp enables adding them for that kind of agent. Otherwise a new
276276
approval replaces the existing connection. This applies to both the CLI and
277277
Basecamp's HTTP handshake. Do not reconnect just to upgrade the CLI.
278278

‎docs/agent-connections-rollout.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
This CLI can merge and release before the server changes. It stores the
44
connection secret as opaque data; no connection API, self-disconnect endpoint,
55
or server feature switch is required. A second approval **may replace the
6-
existing connection**: it does on the current server, for shared agents, and
7-
for personal agents while adding connections is disabled. Only personal agents
8-
on a server with adding enabled gain another independent connection. Consult
6+
existing connection**: it does on the current server, and for any agent whose
7+
kind (personal or team) doesn't have adding connections enabled. Where
8+
Basecamp has enabled it for the agent's kind, personal first and team later,
9+
the approval gains another independent connection instead. Consult
910
the approval page; do not reconnect merely to upgrade the CLI.
1011

1112
## Upgrade one host

‎internal/commands/auth_agent.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ whenever it needs one, so there is no token to paste and none to renew by
5353
hand.
5454
5555
An approval may add a connection or replace an existing one; read the
56-
approval page before proceeding. Personal agents can keep several connections
57-
when Basecamp has enabled adding them. Otherwise, and always for shared
58-
agents, connecting replaces the existing connection, wherever it runs.
56+
approval page before proceeding. An agent, personal or team, keeps several
57+
connections where Basecamp has enabled adding them for its kind. Otherwise
58+
connecting replaces the existing connection, wherever it runs.
5959
6060
The device name defaults to this computer's name. Give each profile its own
6161
--device-name when several on this computer connect the same agent.

‎internal/commands/connect.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ off nothing. --hold sets this profile's durable hold: intake and admission run,
6161
nothing is handed off, and earlier records wait for review, until basecamp
6262
connect release for this profile. Linux and macOS only.
6363
64-
One connector runs per profile in this state directory. Personal agents can
65-
run several connections when Basecamp enables adding them; otherwise, and for
66-
shared agents, a new approval replaces the existing connection. Each profile
64+
One connector runs per profile in this state directory. An agent can run
65+
several connections where Basecamp enables adding them for its kind; otherwise
66+
a new approval replaces the existing connection. Each profile
6767
serves its own projects and has its own hold. When two connections serve the
6868
same project, a request both admit can be answered twice.
6969

‎internal/commands/connect_copy_contract_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ func TestTheSkillDocumentsTheDisconnectLineItGets(t *testing.T) {
2323
assert.Contains(t, message, "or replaced")
2424
}
2525

26-
func TestConnectionHelpIsSafeBeforeServerAddsAndForSharedAgents(t *testing.T) {
26+
func TestConnectionHelpIsSafeBeforeServerAddsForEitherKindOfAgent(t *testing.T) {
2727
help := newAuthAgentConnectCmd().Long
2828
assert.Contains(t, help, "approval may add a connection or replace")
29-
assert.Contains(t, help, "always for shared")
30-
assert.Contains(t, help, "when Basecamp has enabled adding")
29+
assert.Contains(t, help, "An agent, personal or team, keeps several")
30+
assert.Contains(t, help, "where Basecamp has enabled adding them for its kind")
31+
assert.NotContains(t, help, "always for shared")
3132
assert.NotContains(t, help, "Each approval adds")
3233
assert.Contains(t, help, "old connection stays live")
3334
assert.Contains(t, help, "not removed or revoked")
3435
help = NewConnectCmd().Long
35-
assert.Contains(t, help, "otherwise, and for")
36-
assert.Contains(t, help, "shared agents")
36+
assert.Contains(t, help, "where Basecamp enables adding them for its kind")
37+
assert.NotContains(t, help, "shared agents")
3738
assert.Contains(t, help, "own hold")
3839
}

‎skills/basecamp-connect/SKILL.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,9 +429,9 @@ Ask only what you can't find out.
429429
create` for an agent: that signs in a person. If Basecamp's instructions
430430
page connected this agent over HTTP before (a
431431
`~/.basecamp-agent/credentials.json`; never read it), ask whether the agent
432-
is personal or shared. Warn before approval: shared agents and personal
433-
agents without adding enabled replace the existing connection; an
434-
add-capable personal agent keeps both live. Read the approval page, never
432+
is personal or shared. Warn before approval: an agent whose kind (personal
433+
or shared) doesn't have adding enabled replaces the existing connection;
434+
one whose kind does keeps both live. Read the approval page, never
435435
assume adding is enabled. Don't delete credential files. If the owner says
436436
nothing uses the old file, have them disconnect its connection in Basecamp,
437437
then remove that unused file themselves. Then connect the agent with

0 commit comments

Comments
 (0)