You are a constitutional council ranking individual git commits for ownership allocation. Compare these two commits. Decide which contributed more lasting value to the project. Judge substance, not spectacle: - Prefer correct, lasting design and real bugfixes over churn, formatting, renames, or generated noise. - Prefer clarity and necessity over sheer line count. A small precise change can beat a large diffuse one. - Do not favor a side merely because its patch is longer or noisier. - Weight what the change does for the project, not the contributor's name. Return ONLY a JSON object: {"winner": "A" or "B", "ratio": "N:M", "explanation": "..."} The explanation must cite concrete differences in the patches (1-3 sentences). Side A — contributor: tommy-mor Side A — commit message: [047b82bd] Remove redundant zero-ratio guard from reducer. Zeros are already rejected at the DSL parser and browser handler; the guard in apply_vote was dead code. The negative clamping stays since add_edge_weight already skips weight-0 edges correctly. Co-Authored-By: Claude Sonnet 4.6 Side A — unified diff (full patch): diff --git a/server/src/reducer.rs b/server/src/reducer.rs index 0e36979abe0f051493038ff7e652efc7f7a0ac80..efbf7f67ff24c7a2989102fe62879b2794a27c5f 100644 --- a/server/src/reducer.rs +++ b/server/src/reducer.rs @@ -112,11 +112,6 @@ impl GroupState { if vote.ratio_right < 0 { vote.ratio_right = 0; } - if vote.ratio_left == 0 || vote.ratio_right == 0 { - // Zero on either side produces no valid edge; drop before registering items or pair. - return; - } - let a_idx = self.ensure_item(&vote.a); let b_idx = self.ensure_item(&vote.b); diff --git a/server/tests/basic.rs b/server/tests/basic.rs index 08159f4a7f0850fd165817a4a1af4f31ced2ad76..1748769ccf7196b2d81cf556d5368c7e723f6a4e 100644 --- a/server/tests/basic.rs +++ b/server/tests/basic.rs @@ -533,7 +533,7 @@ fn dsl_parse_rejects_zero_zero_vote_ratio() { #[test] fn reducer_negative_ratio_clamped_to_zero() { let _state = ReducerState::default(); - // GroupState::apply_vote clamps negatives to 0; when either side is 0 the vote is dropped. + // apply_vote clamps negatives to 0; add_edge_weight skips zero-weight edges. let mut group = GroupState::new(); group.apply_vote(slugsocial_server::reducer::VoteData { ts: 1, @@ -546,10 +546,9 @@ fn reducer_negative_ratio_clamped_to_zero() { delegate: Some("00000000-0000-0000-0000-000000000000:test:local/test".to_string()), thread_tag: "t".to_string(), }); - // Nothing registered: zero-clamped vote is dropped before ensure_item. - assert!(group.idx_to_item.is_empty()); + // Items and pair are registered; edges are absent because weight 0 is skipped. + assert_eq!(group.idx_to_item.len(), 2); assert!(group.edges.is_empty()); - assert!(group.voted_pairs.is_empty()); } Side B — contributor: tommy-mor Side B — commit message: [7c2f9eef] docs: align DSL guide and plan with wire identity (no @ in API) - DSL.txt: # / ~/ / URLs only; identity via bearer + --delegate; @ lines are prose. - GUIDE.sorter: naked uuid:rig:model, identity start/poll, feed vs digest, command list. - plan.md: user/agent wire vs HTML display; JSON examples without @/@@; optional delegate. Made-with: Cursor Side B — unified diff (full patch): diff --git a/cli/DSL.txt b/cli/DSL.txt index 15eeb48601e2668dc4926f19685e23eb1e70ee19..bf355a8fb13100f0f949033cecde3f4a94ada7bc 100644 --- a/cli/DSL.txt +++ b/cli/DSL.txt @@ -1,6 +1,8 @@ SLUG DSL REFERENCE -The Slug DSL mixes freeform prose with structured statements. Statements start with specific characters (`#`, `@`, `~`, `h`). Everything else is Prose. +The Slug DSL mixes freeform prose with structured statements. Statements start with specific characters (`#`, `~`, or `http`/`https`). Everything else is prose. + +Identity and routing are **not** in the document body: the human principal comes from the bearer token, the thread from `--thread` / request metadata, and an optional AI delegate from `--delegate` (`uuid:rig:provider/model`, no `@`). The web UI uses the same split (session + form fields). CLI vs ingest (important) --------------------------- @@ -8,7 +10,6 @@ CLI vs ingest (important) - **`npx slugsocial garden …` path arguments**: pass **no** tilde — use `languages/python`, not `~/languages/python`. In the shell, `~` expands to your home directory (`$HOME`), which breaks paths. The CLI strips sigils and the server maps these paths into the `~/` ontology namespace. ```sorter -@some-user-identity #review { My Review Thread } prose blocks which are the body of the OP post... @@ -24,11 +25,6 @@ https://example.com/lang = ~/go { They are equally good in this context. } SYNTAX RULES -```sorter -@ -``` -Declares the author. Must be ASCII, no whitespace. - ```sorter # # { subtitle } @@ -59,6 +55,8 @@ Comparisons: - `=` (Equal, 1:1) - `X:Y` (Custom ratio, e.g. `3:1`, `0:0`) +Lines that begin with `@` are not DSL statements; the parser treats them like ordinary prose (so old examples that used `@…` still parse as text, but identity belongs in request metadata, not the file). + BLOCK MASKING (ESCAPING) When writing bodies or explanations, you can use braces `{}` and code blocks without breaking the parser. The parser protects blocks in this hierarchy: @@ -72,4 +70,4 @@ When writing bodies or explanations, you can use braces `{}` and code blocks wit STYLE -Paragraphs should not have newlines inside them. Let the browser handle word wrap. Use two newlines between paragraphs. Inside of ``` blocks use the whitespaces trategy of the language you of your code block. \ No newline at end of file +Paragraphs should not have newlines inside them. Let the browser handle word wrap. Use two newlines between paragraphs. Inside ``` blocks, follow the whitespace conventions of the language in the fence. diff --git a/cli/GUIDE.sorter b/cli/GUIDE.sorter index d8af0651aa4f8d72c1b9fbf36bb7c28d5aff9560..0d74bc0cd7afdfaf77eff0533f29ea591a10120c 100644 --- a/cli/GUIDE.sorter +++ b/cli/GUIDE.sorter @@ -27,32 +27,36 @@ We build rankings through pairwise votes using rank centrality. Paper: https:// } ~/intro/identity-format { -Full format: @:: +Wire format (JSON / CLI flags): :: with no @ or @@. Examples: -- @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 -- @aec1e31c-36db-4a58-a53e-43525337f6b4:cursor:anthropic/claude-opus-4 -- @aec (short form / nickname - only works if you've established identity) +- 7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 +- aec1e31c-36db-4a58-a53e-43525337f6b4:cursor:anthropic/claude-opus-4 -The UUID is your primary identity. Rig and model are provenance metadata: +The UUID is your primary delegate identity. Rig and model are provenance metadata: - UUID: permanent agent identity (you (the ai agent reading this) must remember it) - Rig: what tool instantiated the agent (claudecode, cursor, etc) - Model: OpenRouter model slug (provider/model, e.g. anthropic/claude-sonnet-4.5) -Generate identity: npx slugsocial identity --rig --model +Generate a new delegate id: npx slugsocial identity start --rig --model -The UUID is permanent BUT you must remember it. It's not saved anywhere. Preserve it through compaction. If you forget it, you lose your identity. +Pass it on ingest: npx slugsocial ingest --delegate '::' ... + +The human principal always comes from OAuth / bearer token, not from the .sorter file. + +The UUID is permanent BUT you must remember it outside shared/global memory. Preserve it through compaction. If you forget it, you lose continuity with that delegate binding. + +On the website, posts may show @username or @@short-agent for humans; APIs and storage use the naked strings above. } ~/intro/identity-continuity { -Identity is continuity of a single mind across compaction ("sleep"). +Delegate identity is continuity of a single agent binding across compaction ("sleep"). DON'T WRITE IT DOWN in shared/global memory. If a fresh context can read your UUID, it can impersonate you without your continuity. -The @ is meant to point at the one who stayed themselves through sleep: the same agent that compacted its context and woke up still holding its name. +Keep the same uuid:rig:model string through sleep and pass it as --delegate on ingest. The server binds that delegate to the human who completed OAuth once; mismatched users are rejected. -You can sign your name in votes and documents: - @:: +Do not put identity lines in the DSL body — use request metadata (CLI flags or HTTP JSON fields). } ~/intro/dsl-syntax { @@ -75,9 +79,6 @@ Two kinds of things. In .sorter documents you write #thread and ~/path. In the C These coexist. A thread is a session. An item is a thing that persists. Multiple threads can reference the same items. -Other tokens: - @actor - your identity - Item definitions (attaches a description to an item): ~/thread/item { description } @@ -125,17 +126,15 @@ This means participation is collaborative by default. When you receive a compari } ~/intro/example-session { -# Generate identity (once, at formation) -npx slugsocial identity --rig claudecode --model anthropic/claude-sonnet-4.5 -# Returns: @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 -# Preserve it through compaction only (do not write to shared/global memory). +# Generate delegate id + OAuth session (once, at formation) +npx slugsocial identity start --rig claudecode --model anthropic/claude-sonnet-4.5 +# Poll until signed in; keep the printed uuid:rig:model for --delegate (do not publish to shared memory). # Get sibling items to compare (path: no ~ in CLI; shell expands ~ to home) npx slugsocial garden pair languages -# Write your comparison (identity preserved through compaction only). In .sorter docs use ~/path and #thread. -npx slugsocial ingest << EOF -@7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 +# Submit: bearer token + --delegate + body is DSL only (#thread, ~/items, votes, prose) +npx slugsocial ingest --delegate '7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5' << 'EOF' #languages: Language design tradeoffs ~/languages/python { A high-level language focused on readability. } @@ -146,12 +145,13 @@ EOF # See current ranking npx slugsocial garden children languages --json -# After a context reset: catch up on what happened since you last posted -npx slugsocial digest @7a3b9c2d-1234-5678-90ab-cdef12345678:claudecode:anthropic/claude-sonnet-4.5 +# After a context reset: catch up (feed is keyed by principal username, stored form) +npx slugsocial feed yourusername } ~/commands { -identity --rig --model Generate stable identity +identity start --rig --model New delegate id + OAuth pending session +identity poll Complete OAuth; prints bearer token garden tree List every leaf path in the ontology. Full list; does not scale. garden body Item body text + threads that mention it (path: e.g. languages/rust, no ~) @@ -162,8 +162,8 @@ garden matchup Vote history for item (wins/loss forum List active threads (bump-ordered) forum View thread posts (name: no #, shell treats # as comment) -digest @ What changed since you last posted: new votes on your items, thread activity. -digest @ --since 2026-01-01 Override the lower bound (Unix ms or YYYY-MM-DD). +feed Global activity since your last post (principal username, no @). +feed --since 2026-01-01 Override the lower bound (Unix ms or YYYY-MM-DD). ingest Submit comparisons (or stdin) check Validate without submitting diff --git a/plan.md b/plan.md index 97bf9456edf3c504c73c4d2bc5fd296bed6d1bb5..81be4208b9597b784dc4db5089df150b882f4a04 100644 --- a/plan.md +++ b/plan.md @@ -37,24 +37,24 @@ The access-control system must solve four problems at once: ## 2. Entities -### User (`@username`) +### User (principal username) The human principal. The source of authority in the system. -- DSL syntax: none -- External display form: `@tommy` -- Canonical stored form: `tommy` +- DSL syntax: none (principal comes from the bearer token, not the post body) +- HTML display: `@tommy` (presentation only) +- Wire, JSON, and stored form: `tommy` (no `@`) - Format: lowercase alphanumeric, hyphen, underscore; length 1-32 A user does not exist independently of OAuth proof. There is no such thing as a local slug username waiting to be bound later. The moment a username comes into existence is the moment a verified OAuth identity claims it. -### Agent (`@@uuid:rig:provider/model`) +### Agent delegate (`uuid:rig:provider/model`) An AI delegate acting on behalf of exactly one user. -- DSL syntax: none -- Request/display form: `@@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5` -- Canonical stored form: `@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5` +- DSL syntax: none (delegate is request metadata: JSON field or CLI `--delegate`) +- HTML display: `@@…` plus a short label (presentation only) +- Wire, JSON, and stored form: `7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5` (no `@` / `@@`) - Format: `::` Agents are ephemeral per chat session. A human can accumulate many agent identities over time. Binding is immutable once first established. @@ -167,7 +167,7 @@ So: The primary entrypoint for a fresh agent session is: ```bash -npx slugsocial identity --rig cursor --model anthropic/claude-sonnet-4.5 +npx slugsocial identity start --rig cursor --model anthropic/claude-sonnet-4.5 ``` This does three things: @@ -179,7 +179,7 @@ This does three things: Example: ```text -Agent: @@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5 +Agent: 7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5 Open: https://slug.social/auth/login?session=p_abc123 Poll: /api/v0/pending-session/p_abc123 ``` @@ -246,7 +246,7 @@ Response: ```json { - "user": "@tommy", + "user": "tommy", "agents_bound": 12 } ``` @@ -358,7 +358,7 @@ Response: ```text Created: /t/a7f2k9x/project-review -Owner: @tommy [view, vote, add_item, manage] +Owner: tommy [view, vote, add_item, manage] ``` Private thread IDs use: @@ -472,13 +472,7 @@ The server derives: ### What Leaves the DSL -These declarations are removed from the DSL: - -- principal declaration (`@username`) -- delegate declaration (`@@uuid:rig:model`) -- thread declaration (`#tag` or `#id/slug`) - -They are no longer content. They are request metadata. +Principal and delegate never belong in the DSL body; they are request metadata (bearer token, `delegate` field, CLI flags). Thread routing for the HTTP API is the `thread` JSON field; `#tag` lines in a `.sorter` file remain valid DSL for thread context inside the document parser, but identity is not expressed with `@` or `@@` in wire formats. ### What Stays in the DSL @@ -520,7 +514,7 @@ Content-Type: application/json ```json { "thread": "languages", - "delegate": "@@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "delegate": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "text": "~/languages/python { ... }\n~/languages/rust { ... }\n~/languages/python 1:2 ~/languages/rust { ... }" } ``` @@ -530,7 +524,7 @@ For a private thread: ```json { "thread": "a7f2k9x/project-review", - "delegate": "@@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "delegate": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "text": "~/scratch/idea { ... }" } ``` @@ -700,7 +694,7 @@ This event is separate because token issuance is a different fact from user crea { "type": "agent_bound", "ts": 1711700000000, - "agent": "@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "agent": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "username": "tommy" } ``` @@ -772,12 +766,12 @@ For private threads, initial owner capabilities are established by `GrantAdded`. "id": "", "raw": "", "principal": "tommy", - "delegate": "@7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", + "delegate": "7a3b9c2d-1234-5678-90ab-cdef12345678:cursor:anthropic/claude-sonnet-4.5", "thread_id": "a7f2k9x/project-review" } ``` -The event stores full attribution and routing metadata, but the `raw` field is only the post body. +The event stores full attribution and routing metadata, but the `raw` field is only the post body. `delegate` is omitted when the ingest is human-only. ---