code.oscarkilo.com/okg #9b4c953ff93cfffd0976d102fb173f4eef21ff92

Hash:

9b4c953ff93cfffd0976d102fb173f4eef21ff92

Author:

Date:

Thu Jun 4 20:57:06 2026 -0400

Message:

okg: add `okg group remove-member` POST /groups/leave via //okg/who's new LeaveGroup method. CLI shape: `okg group remove-member GROUP USER [USER ...]`. /groups/leave takes owids, not usernames — asymmetric with /groups/join. Rather than patch //who (which would cascade to fixing its current clients), the CLI does the translation: 1. GET /groups/list to resolve GROUP → group_owid. 2. POST /groups/members on group_owid to get username → owid map for the members. 3. POST /groups/leave for each (group_owid, member_owid). Two upfront round-trips plus N leave calls. The N members share the resolution, so a bulk remove is at most N+2 requests. //okg/who gets matching new methods + types: - GroupMembers(owid) → GroupMembersResponse {Up, Down, Usernames}. - LeaveGroup(LeaveGroupRequest{GroupOwid, MemberOwid}). Tests: TestGroupMembers pins the POST body shape; TestLeaveGroup pins the leave request body.

diff --git a/README.md b/README.md
index 59d442f..6a76993 100644
--- a/README.md
+++ b/README.md
@@ -56,9 +56,10 @@ okg pr reopen NUMBER

okg auth login [--key KEY] [--host HOST]

-okg group list [--json]
-okg group create NAME [--full-name TEXT] [--owner USER]
-okg group add-member GROUP USER [USER ...]
+okg group list [--json]
+okg group create NAME [--full-name TEXT] [--owner USER]
+okg group add-member GROUP USER [USER ...]
+okg group remove-member GROUP USER [USER ...]

okg embed [--model NAME] [--dims N] [--full-path]
(reads stdin → vectors on stdout)
diff --git a/group.go b/group.go
index beab408..7c03219 100644
--- a/group.go
+++ b/group.go
@@ -21,6 +21,8 @@ func runGroup(args []string) error {
return runGroupCreate(args[1:])
case "add-member":
return runGroupAddMember(args[1:])
+ case "remove-member":
+ return runGroupRemoveMember(args[1:])
default:
return fmt.Errorf(
"unknown group subcommand: %s", args[0])
@@ -137,6 +139,82 @@ func runGroupAddMember(args []string) error {
return nil
}

+func runGroupRemoveMember(args []string) error {
+ fs := flag.NewFlagSet(
+ "group remove-member", flag.ContinueOnError)
+ if err := fs.Parse(args); err != nil {
+ return err
+ }
+ positional := fs.Args()
+ if len(positional) < 2 {
+ return fmt.Errorf(
+ "usage: okg group remove-member " +
+ "GROUP USER [USER ...]")
+ }
+ groupName := positional[0]
+ members := positional[1:]
+
+ c, err := newWhoClient()
+ if err != nil {
+ return err
+ }
+
+ // /groups/leave wants owids, not usernames. Resolve the
+ // group's owid via ListGroups, then the members' owids via
+ // GroupMembers. Two round-trips on top of the actual leave
+ // calls; shared across all members in this invocation.
+ groupOwid, err := resolveGroupOwid(c, groupName)
+ if err != nil {
+ return err
+ }
+ ms, err := c.GroupMembers(groupOwid)
+ if err != nil {
+ return err
+ }
+ username2owid := make(map[string]string)
+ for owid, name := range ms.Usernames {
+ username2owid[name] = owid
+ }
+
+ for _, m := range members {
+ memberOwid, ok := username2owid[m]
+ if !ok {
+ return fmt.Errorf(
+ "user %q is not a member of %s", m, groupName)
+ }
+ if err := c.LeaveGroup(who.LeaveGroupRequest{
+ GroupOwid: groupOwid,
+ MemberOwid: memberOwid,
+ }); err != nil {
+ return fmt.Errorf(
+ "remove %s from %s: %v", m, groupName, err)
+ }
+ }
+ fmt.Printf(
+ "Removed %d member(s) from %s\n",
+ len(members), groupName)
+ return nil
+}
+
+// resolveGroupOwid translates a group username to its owid via
+// /groups/list. Returns an error if the group isn't visible to
+// the caller.
+func resolveGroupOwid(
+ c *who.HTTPClient, name string,
+) (string, error) {
+ groups, err := c.ListGroups()
+ if err != nil {
+ return "", err
+ }
+ for _, g := range groups {
+ if g.Username == name {
+ return g.Owid, nil
+ }
+ }
+ return "", fmt.Errorf(
+ "group %q not found (or not visible to caller)", name)
+}
+
// newWhoClient builds a //who client from saved config. Shared
// by every `okg group` subcommand.
func newWhoClient() (*who.HTTPClient, error) {
diff --git a/main.go b/main.go
index 23cd231..028166c 100644
--- a/main.go
+++ b/main.go
@@ -65,6 +65,8 @@ GROUPS

okg group add-member GROUP USER [USER ...]

+ okg group remove-member GROUP USER [USER ...]
+
PULL REQUESTS
okg pr list
--state STATE open or closed (default: open)
@@ -131,6 +133,7 @@ EXAMPLES
okg group list
okg group create chat-bots
okg group add-member chat-bots claude openclaw
+ okg group remove-member chat-bots openclaw

Pull requests
okg pr list --state open
diff --git a/who/who.go b/who/who.go
index aa2e82b..f15c81c 100644
--- a/who/who.go
+++ b/who/who.go
@@ -104,3 +104,42 @@ type JoinGroupsRequest struct {
func (c *HTTPClient) JoinGroups(req JoinGroupsRequest) error {
return c.PostJSON("/groups/join", req, nil)
}
+
+// GroupMembersResponse is the response from POST
+// /groups/members. Up lists the groups that contain the queried
+// entity (each level as a slice of owids). Down lists its
+// members the same way. Usernames maps every owid mentioned to
+// its //who username.
+type GroupMembersResponse struct {
+ Up [][]string `json:"up"`
+ Down [][]string `json:"down"`
+ Usernames map[string]string `json:"usernames"`
+}
+
+// GroupMembers returns membership DAG navigation for the given
+// entity owid. For a group, Down enumerates its members.
+func (c *HTTPClient) GroupMembers(
+ ownerOwid string,
+) (*GroupMembersResponse, error) {
+ var res GroupMembersResponse
+ err := c.PostJSON("/groups/members",
+ map[string]string{"owid": ownerOwid}, &res)
+ if err != nil {
+ return nil, err
+ }
+ return &res, nil
+}
+
+// LeaveGroupRequest is the body for POST /groups/leave. Both
+// IDs are owids (obfuscated wids); to translate from usernames,
+// call ListGroups + GroupMembers first.
+type LeaveGroupRequest struct {
+ GroupOwid string `json:"group_owid"`
+ MemberOwid string `json:"member_owid"`
+}
+
+// LeaveGroup removes a member from a group. The caller must own
+// the group.
+func (c *HTTPClient) LeaveGroup(req LeaveGroupRequest) error {
+ return c.PostJSON("/groups/leave", req, nil)
+}
diff --git a/who/who_test.go b/who/who_test.go
index d0d4da1..ad6c1c8 100644
--- a/who/who_test.go
+++ b/who/who_test.go
@@ -142,6 +142,76 @@ func TestCreateGroup(t *testing.T) {
}
}

+func TestGroupMembers(t *testing.T) {
+ srv := httptest.NewServer(http.HandlerFunc(
+ func(w http.ResponseWriter, r *http.Request) {
+ if r.URL.Path != "/groups/members" {
+ t.Errorf(
+ "path: got %q, want /groups/members",
+ r.URL.Path)
+ }
+ var body map[string]string
+ json.NewDecoder(r.Body).Decode(&body)
+ if body["owid"] != "team-owid" {
+ t.Errorf(
+ "owid: got %q, want team-owid", body["owid"])
+ }
+ json.NewEncoder(w).Encode(GroupMembersResponse{
+ Down: [][]string{
+ {"alice-owid", "bob-owid"},
+ },
+ Usernames: map[string]string{
+ "alice-owid": "alice",
+ "bob-owid": "bob",
+ },
+ })
+ }))
+ defer srv.Close()
+
+ c := NewHTTPClient(srv.URL, "test-key")
+ res, err := c.GroupMembers("team-owid")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if res.Usernames["alice-owid"] != "alice" {
+ t.Errorf(
+ "Usernames[alice-owid]: got %q",
+ res.Usernames["alice-owid"])
+ }
+}
+
+func TestLeaveGroup(t *testing.T) {
+ var seen LeaveGroupRequest
+ srv := httptest.NewServer(http.HandlerFunc(
+ func(w http.ResponseWriter, r *http.Request) {
+ if r.URL.Path != "/groups/leave" {
+ t.Errorf(
+ "path: got %q, want /groups/leave",
+ r.URL.Path)
+ }
+ json.NewDecoder(r.Body).Decode(&seen)
+ w.WriteHeader(204)
+ }))
+ defer srv.Close()
+
+ c := NewHTTPClient(srv.URL, "test-key")
+ err := c.LeaveGroup(LeaveGroupRequest{
+ GroupOwid: "team-owid",
+ MemberOwid: "alice-owid",
+ })
+ if err != nil {
+ t.Fatal(err)
+ }
+ if seen.GroupOwid != "team-owid" {
+ t.Errorf(
+ "GroupOwid: got %q", seen.GroupOwid)
+ }
+ if seen.MemberOwid != "alice-owid" {
+ t.Errorf(
+ "MemberOwid: got %q", seen.MemberOwid)
+ }
+}
+
func TestJoinGroups(t *testing.T) {
var seen JoinGroupsRequest
srv := httptest.NewServer(http.HandlerFunc(

# okg — Oscar Kilo Goodness

A command-line tool that bundles Oscar Kilo's externally usable

services into one binary. Today: git ops against

[klee](https://code.oscarkilo.com), and LLM embeddings against

[klex](https://oscarkilo.com/klex). More LLM utilities (`one`,

`exemplary`) coming as the legacy `klex-git` binaries fold in.

Designed for both humans and AI agents (Claude, OpenClaw) to

use directly from the command line.

## Install

```bash

go install oscarkilo.com/okg@latest

```

Or build from source:

```bash

git clone https://code.oscarkilo.com/okg

cd okg && go build .

```

## Setup

By default okg talks to the production klee host

(`https://code.oscarkilo.com`); the only setup you need is your

API key. `okg auth login` saves it to

`~/.config/okg/config.json`.

```bash

# Non-interactive (for agents and scripts).

okg auth login --key sk-...

cat ~/.klex.key | okg auth login # equivalent, ps-safe

# Interactive (prompts for host then key).

okg auth login

```

Override the host for dev/local work with `--host` on `auth login`.

## Commands

```

okg repo list

okg pr list [--state open|closed]

okg pr create --head BRANCH [--base master] --title TITLE [--body BODY]

okg pr view NUMBER

okg pr diff NUMBER

okg pr comment NUMBER --body BODY [--approve | --request-changes]

okg pr merge NUMBER

okg pr close NUMBER

okg pr reopen NUMBER

okg auth login [--key KEY] [--host HOST]

okg group list [--json]

okg group create NAME [--full-name TEXT] [--owner USER]

okg group add-member GROUP USER [USER ...]

okg group remove-member GROUP USER [USER ...]

okg embed [--model NAME] [--dims N] [--full-path]

(reads stdin → vectors on stdout)

okg one [--model NAME] [--system-file FILE] \

[--prompt-file FILE] [--attach FILE] \

[--format text|json|jsonindent] [--fast-fail]

(reads stdin as a JSON MessagesRequest)

```

### Coming next

- `okg exemplary` — few-shot batch runner (from

`klex-git/exemplary`).

Once that lands, the standalone `klex-git` binaries are

deprecated.

### Flags

- `--repo REPO` overrides auto-detected repo name

(normally parsed from `git remote get-url origin`)

- `--json` outputs raw JSON for any command

- `OKG_REPO` env var also overrides repo detection

## Repo Detection

Like `gh`, okg detects the repo from the current directory's

git remote:

```

git remote get-url origin

→ https://code.oscarkilo.com/widget.git

→ repo = "widget"

```

## Dependencies

- `oscarkilo.com/klex-git` for the LLM API client (transitional;

100

- `oscarkilo.com/klex-git` for the LLM API client (transitional;

100

to be folded in once all `klex-git` binaries have moved here).

101

to be folded in once all `klex-git` binaries have moved here).

101

- Otherwise Go standard library only.

102

- Otherwise Go standard library only.

package main

import "encoding/json"

import "flag"

import "fmt"

import "os"

import "text/tabwriter"

import "oscarkilo.com/okg/who"

func runGroup(args []string) error {

if len(args) == 0 {

return fmt.Errorf(

"usage: okg group SUBCOMMAND ... " +

"(try `okg --help`)")

}

switch args[0] {

case "list":

return runGroupList(args[1:])

case "create":

return runGroupCreate(args[1:])

case "add-member":

return runGroupAddMember(args[1:])

case "remove-member":

return runGroupRemoveMember(args[1:])

default:

return fmt.Errorf(

"unknown group subcommand: %s", args[0])

}

func runGroupList(args []string) error {

fs := flag.NewFlagSet("group list", flag.ContinueOnError)

asJSON := fs.Bool("json", false, "output raw JSON")

if err := fs.Parse(args); err != nil {

return err

}

c, err := newWhoClient()

if err != nil {

return err

}

groups, err := c.ListGroups()

if err != nil {

return err

}

if *asJSON {

buf, err := json.MarshalIndent(groups, "", " ")

if err != nil {

return err

}

fmt.Println(string(buf))

return nil

}

tw := tabwriter.NewWriter(os.Stdout, 0, 2, 2, ' ', 0)

fmt.Fprintln(tw, "USERNAME\tFULL NAME\tOWNER")

for _, g := range groups {

fmt.Fprintf(tw, "%s\t%s\t%s\n",

g.Username, g.Name, g.OwnerUsername)

}

return tw.Flush()

}

func runGroupCreate(args []string) error {

fs := flag.NewFlagSet(

"group create", flag.ContinueOnError)

fullName := fs.String("full-name", "",

"display name (default: NAME)")

owner := fs.String("owner", "",

"owner username (default: caller)")

if err := fs.Parse(args); err != nil {

return err

}

positional := fs.Args()

if len(positional) != 1 {

return fmt.Errorf("usage: okg group create NAME")

}

name := positional[0]

c, err := newWhoClient()

if err != nil {

return err

}

if *owner == "" {

me, err := c.GetProfile()

if err != nil {

return fmt.Errorf("resolve caller: %v", err)

}

*owner = me.Username

}

displayName := *fullName

if displayName == "" {

displayName = name

}

100

if err := c.CreateGroup(who.CreateGroupRequest{

101

if err := c.CreateGroup(who.CreateGroupRequest{

100

Username: name,

102

Username: name,

101

Name: displayName,

103

Name: displayName,

102

OwnerUsername: *owner,

104

OwnerUsername: *owner,

103

}); err != nil {

105

}); err != nil {

104

return err

106

return err

105

}

107

}

106

fmt.Printf(

108

fmt.Printf(

107

"Created group %s (owner: %s)\n", name, *owner)

109

"Created group %s (owner: %s)\n", name, *owner)

108

return nil

110

return nil

109

}

111

}

110

112

111

func runGroupAddMember(args []string) error {

113

func runGroupAddMember(args []string) error {

112

fs := flag.NewFlagSet(

114

fs := flag.NewFlagSet(

113

"group add-member", flag.ContinueOnError)

115

"group add-member", flag.ContinueOnError)

114

if err := fs.Parse(args); err != nil {

116

if err := fs.Parse(args); err != nil {

115

return err

117

return err

116

}

118

}

117

positional := fs.Args()

119

positional := fs.Args()

118

if len(positional) < 2 {

120

if len(positional) < 2 {

119

return fmt.Errorf(

121

return fmt.Errorf(

120

"usage: okg group add-member GROUP USER [USER ...]")

122

"usage: okg group add-member GROUP USER [USER ...]")

121

}

123

}

122

group := positional[0]

124

group := positional[0]

123

members := positional[1:]

125

members := positional[1:]

124

126

125

c, err := newWhoClient()

127

c, err := newWhoClient()

126

if err != nil {

128

if err != nil {

127

return err

129

return err

128

}

130

}

129

if err := c.JoinGroups(who.JoinGroupsRequest{

131

if err := c.JoinGroups(who.JoinGroupsRequest{

130

GroupUsernames: []string{group},

132

GroupUsernames: []string{group},

131

MemberUsernames: members,

133

MemberUsernames: members,

132

}); err != nil {

134

}); err != nil {

133

return err

135

return err

134

}

136

}

135

fmt.Printf(

137

fmt.Printf(

136

"Added %d member(s) to %s\n", len(members), group)

138

"Added %d member(s) to %s\n", len(members), group)

137

return nil

139

return nil

138

}

140

}

139

141

142

func runGroupRemoveMember(args []string) error {

143

fs := flag.NewFlagSet(

144

"group remove-member", flag.ContinueOnError)

145

if err := fs.Parse(args); err != nil {

146

return err

147

}

148

positional := fs.Args()

149

if len(positional) < 2 {

150

return fmt.Errorf(

151

"usage: okg group remove-member " +

152

"GROUP USER [USER ...]")

153

}

154

groupName := positional[0]

155

members := positional[1:]

156

157

c, err := newWhoClient()

158

if err != nil {

159

return err

160

}

161

162

// /groups/leave wants owids, not usernames. Resolve the

163

// group's owid via ListGroups, then the members' owids via

164

// GroupMembers. Two round-trips on top of the actual leave

165

// calls; shared across all members in this invocation.

166

groupOwid, err := resolveGroupOwid(c, groupName)

167

if err != nil {

168

return err

169

}

170

ms, err := c.GroupMembers(groupOwid)

171

if err != nil {

172

return err

173

}

174

username2owid := make(map[string]string)

175

for owid, name := range ms.Usernames {

176

username2owid[name] = owid

177

}

178

179

for _, m := range members {

180

memberOwid, ok := username2owid[m]

181

if !ok {

182

return fmt.Errorf(

183

"user %q is not a member of %s", m, groupName)

184

}

185

if err := c.LeaveGroup(who.LeaveGroupRequest{

186

GroupOwid: groupOwid,

187

MemberOwid: memberOwid,

188

}); err != nil {

189

return fmt.Errorf(

190

"remove %s from %s: %v", m, groupName, err)

191

}

192

}

193

fmt.Printf(

194

"Removed %d member(s) from %s\n",

195

len(members), groupName)

196

return nil

197

}

198

199

// resolveGroupOwid translates a group username to its owid via

200

// /groups/list. Returns an error if the group isn't visible to

201

// the caller.

202

func resolveGroupOwid(

203

c *who.HTTPClient, name string,

204

) (string, error) {

205

groups, err := c.ListGroups()

206

if err != nil {

207

return "", err

208

}

209

for _, g := range groups {

210

if g.Username == name {

211

return g.Owid, nil

212

}

213

}

214

return "", fmt.Errorf(

215

"group %q not found (or not visible to caller)", name)

216

}

217

140

// newWhoClient builds a //who client from saved config. Shared

218

// newWhoClient builds a //who client from saved config. Shared

141

// by every `okg group` subcommand.

219

// by every `okg group` subcommand.

142

func newWhoClient() (*who.HTTPClient, error) {

220

func newWhoClient() (*who.HTTPClient, error) {

143

cfg, err := loadConfig()

221

cfg, err := loadConfig()

144

if err != nil {

222

if err != nil {

145

return nil, err

223

return nil, err

146

}

224

}

147

if cfg.ApiKey == "" {

225

if cfg.ApiKey == "" {

148

return nil, fmt.Errorf(

226

return nil, fmt.Errorf(

149

"no API key — run `okg auth login --key sk-...`")

227

"no API key — run `okg auth login --key sk-...`")

150

}

228

}

151

return who.NewHTTPClient(cfg.Host, cfg.ApiKey), nil

229

return who.NewHTTPClient(cfg.Host, cfg.ApiKey), nil

152

}

230

}

package main

import "fmt"

import "os"

func main() {

args := os.Args[1:]

if len(args) == 0 {

printUsage()

os.Exit(1)

}

var err error

switch args[0] {

case "pr":

err = runPR(args[1:])

case "repo":

err = runRepo(args[1:])

case "auth":

err = runAuth(args[1:])

case "embed":

err = runEmbed(args[1:])

case "one":

err = runOne(args[1:])

case "group":

err = runGroup(args[1:])

case "help", "--help", "-h":

printUsage()

return

default:

fmt.Fprintf(os.Stderr, "unknown command: %s\n", args[0])

printUsage()

os.Exit(1)

}

if err != nil {

fmt.Fprintf(os.Stderr, "error: %v\n", err)

os.Exit(1)

}

func printUsage() {

fmt.Fprintf(os.Stderr, `NAME

okg — Oscar Kilo Goodness

SETUP

okg auth login

--key KEY API key (also accepted via stdin)

--host HOST klee host (default: production)

GIT REPOS

okg repo list

--json output raw JSON

okg repo create NAME

--reader USER grant read to USER (default: anyone)

GROUPS

okg group list

--json output raw JSON

okg group create NAME

--full-name TEXT display name (default: NAME)

--owner USER owner username (default: caller)

okg group add-member GROUP USER [USER ...]

okg group remove-member GROUP USER [USER ...]

PULL REQUESTS

okg pr list

--state STATE open or closed (default: open)

--json output raw JSON

okg pr create

--head BRANCH source branch

--base BRANCH target branch (default: master)

--title TITLE PR title

--body BODY PR body (optional)

--json output raw JSON

okg pr view NUMBER

--json output raw JSON

okg pr diff NUMBER

okg pr comment NUMBER

--body BODY comment body

--approve also approve the PR

--request-changes also request changes

okg pr merge NUMBER

--json output raw JSON

okg pr close NUMBER

--json output raw JSON

okg pr reopen NUMBER

--json output raw JSON

100

ARTIFICIAL INTELLIGENCE

101

ARTIFICIAL INTELLIGENCE

100

okg embed

102

okg embed

101

--model NAME embedding model

103

--model NAME embedding model

102

(default: openai:text-embedding-3-small)

104

(default: openai:text-embedding-3-small)

103

--dims N number of dimensions (default: 1536)

105

--dims N number of dimensions (default: 1536)

104

--full-path one vector per prefix of input

106

--full-path one vector per prefix of input

105

(reads stdin; writes vectors to stdout, one per line)

107

(reads stdin; writes vectors to stdout, one per line)

106

108

107

okg one

109

okg one

108

--model NAME override .Model in the request

110

--model NAME override .Model in the request

109

--system-file FILE override .System with contents of FILE

111

--system-file FILE override .System with contents of FILE

110

--prompt-file FILE append FILE as a user prompt

112

--prompt-file FILE append FILE as a user prompt

111

--attach FILE attach an image or PDF to the prompt

113

--attach FILE attach an image or PDF to the prompt

112

--format FORMAT text | json | jsonindent (default: text)

114

--format FORMAT text | json | jsonindent (default: text)

113

--fast-fail preflight attachment MIME (default: on)

115

--fast-fail preflight attachment MIME (default: on)

114

(reads stdin as a JSON MessagesRequest; flags override

116

(reads stdin as a JSON MessagesRequest; flags override

115

its fields)

117

its fields)

116

118

117

GLOBAL FLAGS

119

GLOBAL FLAGS

118

--repo REPO override auto-detected repo name

120

--repo REPO override auto-detected repo name

119

--json output raw JSON (where applicable)

121

--json output raw JSON (where applicable)

120

122

121

EXAMPLES

123

EXAMPLES

122

Setup

124

Setup

123

okg auth login --key sk-...

125

okg auth login --key sk-...

124

cat ~/.klex.key | okg auth login

126

cat ~/.klex.key | okg auth login

125

127

126

Git repos

128

Git repos

127

okg repo list

129

okg repo list

128

okg repo create my-new-repo

130

okg repo create my-new-repo

129

131

130

Groups

132

Groups

131

okg group list

133

okg group list

132

okg group create chat-bots

134

okg group create chat-bots

133

okg group add-member chat-bots claude openclaw

135

okg group add-member chat-bots claude openclaw

136

okg group remove-member chat-bots openclaw

134

137

135

Pull requests

138

Pull requests

136

okg pr list --state open

139

okg pr list --state open

137

okg pr view 42

140

okg pr view 42

138

okg pr comment 42 --body 'LGTM' --approve

141

okg pr comment 42 --body 'LGTM' --approve

139

142

140

Artificial intelligence

143

Artificial intelligence

141

echo 'hello world' | okg embed --dims 384

144

echo 'hello world' | okg embed --dims 384

142

echo Hello? > /tmp/q.txt && \

145

echo Hello? > /tmp/q.txt && \

143

okg one --model openai:gpt-4o-mini --prompt-file /tmp/q.txt

146

okg one --model openai:gpt-4o-mini --prompt-file /tmp/q.txt

144

147

145

}

148

}

// Package who is the public HTTP client for OscarKilo's //who

// service. It is the world-public side of //who, used by

// `okg` and any other tool that talks to oscarkilo.com over

// the network.

// //clients/who (intra-cluster, has the in-process MockClient,

// the /internal/* calls, the dev/prod factory) will eventually

// import this package via `import . "oscarkilo.com/okg/who"`

// so the two share types and request paths. To make that dot

// import work, the struct here is named HTTPClient — leaving

// the unqualified `Client` name free for //clients/who's

// existing interface.

package who

import "oscarkilo.com/okg/internal/rest"

// HTTPClient talks to a //who server over HTTPS. Embeds the

// shared rest helpers; who-specific methods live below.

type HTTPClient struct {

*rest.Client

}

func NewHTTPClient(host, apiKey string) *HTTPClient {

return &HTTPClient{Client: rest.NewClient(host, apiKey)}

}

// ---- Caller identity ----

// Profile is the caller's //who profile. Mirrors the

// JSON-serialized subset of //who.Profile that GET

// /login/profile/get returns. Extra fields the server may

// return (ApiKeys, Logins, AppData, timestamps) are decoded

// permissively if added later; we just don't expose them here

// until okg has a use for them.

type Profile struct {

Owid string `json:"owid"`

Username string `json:"username"`

Name string `json:"name"`

Email string `json:"email"`

PortraitUrl string `json:"portrait_url"`

OwnerOwid string `json:"owner_owid"`

Groups []string `json:"groups"`

}

// GetProfile returns the caller's own profile, identified by

// the Bearer key.

func (c *HTTPClient) GetProfile() (*Profile, error) {

var p Profile

if err := c.GetJSON("/login/profile/get", &p); err != nil {

return nil, err

}

return &p, nil

}

// ---- Groups ----

// Group describes a //who group (a named entity with members).

// Mirrors the listedGroup shape in //who/server/groups_list.go.

type Group struct {

Owid string `json:"owid"`

Username string `json:"username"`

Name string `json:"name"`

OwnerOwid string `json:"owner_owid"`

OwnerUsername string `json:"owner_username"`

}

type listGroupsResponse struct {

Groups []Group `json:"groups"`

}

// ListGroups returns the groups visible to the caller.

func (c *HTTPClient) ListGroups() ([]Group, error) {

var res listGroupsResponse

if err := c.GetJSON("/groups/list", &res); err != nil {

return nil, err

}

return res.Groups, nil

}

// CreateGroupRequest is the body for POST /groups/add. Username

// is the group's //who username (e.g. "team"); Name is the

// human-facing display name; OwnerUsername is the user who'll

// own the new group.

type CreateGroupRequest struct {

Username string `json:"username"`

Name string `json:"name"`

OwnerUsername string `json:"owner_username"`

}

// CreateGroup creates a new //who group.

func (c *HTTPClient) CreateGroup(req CreateGroupRequest) error {

return c.PostJSON("/groups/add", req, nil)

}

// JoinGroupsRequest is the body for POST /groups/join. The

// server adds every (GroupUsernames[i], MemberUsernames[j])

// pair, requiring the caller to be an owner of each group.

type JoinGroupsRequest struct {

GroupUsernames []string `json:"group_usernames"`

100

MemberUsernames []string `json:"member_usernames"`

100

MemberUsernames []string `json:"member_usernames"`

101

}

101

}

102

103

// JoinGroups adds members to groups (all pairwise combinations).

103

// JoinGroups adds members to groups (all pairwise combinations).

104

func (c *HTTPClient) JoinGroups(req JoinGroupsRequest) error {

104

func (c *HTTPClient) JoinGroups(req JoinGroupsRequest) error {

105

return c.PostJSON("/groups/join", req, nil)

105

return c.PostJSON("/groups/join", req, nil)

106

}

106

}

107

108

// GroupMembersResponse is the response from POST

109

// /groups/members. Up lists the groups that contain the queried

110

// entity (each level as a slice of owids). Down lists its

111

// members the same way. Usernames maps every owid mentioned to

112

// its //who username.

113

type GroupMembersResponse struct {

114

Up [][]string `json:"up"`

115

Down [][]string `json:"down"`

116

Usernames map[string]string `json:"usernames"`

117

}

118

119

// GroupMembers returns membership DAG navigation for the given

120

// entity owid. For a group, Down enumerates its members.

121

func (c *HTTPClient) GroupMembers(

122

ownerOwid string,

123

) (*GroupMembersResponse, error) {

124

var res GroupMembersResponse

125

err := c.PostJSON("/groups/members",

126

map[string]string{"owid": ownerOwid}, &res)

127

if err != nil {

128

return nil, err

129

}

130

return &res, nil

131

}

132

133

// LeaveGroupRequest is the body for POST /groups/leave. Both

134

// IDs are owids (obfuscated wids); to translate from usernames,

135

// call ListGroups + GroupMembers first.

136

type LeaveGroupRequest struct {

137

GroupOwid string `json:"group_owid"`

138

MemberOwid string `json:"member_owid"`

139

}

140

141

// LeaveGroup removes a member from a group. The caller must own

142

// the group.

143

func (c *HTTPClient) LeaveGroup(req LeaveGroupRequest) error {

144

return c.PostJSON("/groups/leave", req, nil)

145

}

package who

import "encoding/json"

import "net/http"

import "net/http/httptest"

import "testing"

func TestListGroups(t *testing.T) {

srv := httptest.NewServer(http.HandlerFunc(

func(w http.ResponseWriter, r *http.Request) {

if r.URL.Path != "/groups/list" {

t.Errorf("path: got %q, want /groups/list",

r.URL.Path)

}

if r.Header.Get("Authorization") !=

"Bearer test-key" {

t.Errorf("Authorization: got %q",

r.Header.Get("Authorization"))

}

w.Header().Set(

"Content-Type", "application/json")

json.NewEncoder(w).Encode(listGroupsResponse{

Groups: []Group{

{

Username: "team",

Name: "Team",

OwnerUsername: "alice",

{

Username: "admins",

Name: "Admins",

OwnerUsername: "alice",

})

}))

defer srv.Close()

c := NewHTTPClient(srv.URL, "test-key")

groups, err := c.ListGroups()

if err != nil {

t.Fatal(err)

}

if len(groups) != 2 {

t.Fatalf("len: got %d, want 2", len(groups))

}

if groups[0].Username != "team" {

t.Errorf(

"groups[0].Username: got %q, want team",

groups[0].Username)

}

if groups[1].OwnerUsername != "alice" {

t.Errorf(

"groups[1].OwnerUsername: got %q, want alice",

groups[1].OwnerUsername)

}

func TestListGroupsHTTPError(t *testing.T) {

srv := httptest.NewServer(http.HandlerFunc(

func(w http.ResponseWriter, r *http.Request) {

w.WriteHeader(401)

w.Write([]byte("not authenticated"))

}))

defer srv.Close()

c := NewHTTPClient(srv.URL, "bad-key")

_, err := c.ListGroups()

if err == nil {

t.Fatal("want error on 401, got nil")

}

func TestGetProfile(t *testing.T) {

srv := httptest.NewServer(http.HandlerFunc(

func(w http.ResponseWriter, r *http.Request) {

if r.URL.Path != "/login/profile/get" {

t.Errorf(

"path: got %q, want /login/profile/get",

r.URL.Path)

}

w.Header().Set(

"Content-Type", "application/json")

json.NewEncoder(w).Encode(Profile{

Username: "alice",

Name: "Alice Liddell",

Email: "[email protected]",

Groups: []string{"team", "admins"},

})

}))

defer srv.Close()

c := NewHTTPClient(srv.URL, "test-key")

p, err := c.GetProfile()

if err != nil {

t.Fatal(err)

}

if p.Username != "alice" {

t.Errorf(

100

"Username: got %q, want alice", p.Username)

100

"Username: got %q, want alice", p.Username)

101

}

101

}

102

if len(p.Groups) != 2 {

102

if len(p.Groups) != 2 {

103

t.Errorf(

103

t.Errorf(

104

"Groups: got %d, want 2", len(p.Groups))

104

"Groups: got %d, want 2", len(p.Groups))

105

}

105

}

106

}

106

}

107

108

func TestCreateGroup(t *testing.T) {

108

func TestCreateGroup(t *testing.T) {

109

var seen CreateGroupRequest

109

var seen CreateGroupRequest

110

srv := httptest.NewServer(http.HandlerFunc(

110

srv := httptest.NewServer(http.HandlerFunc(

111

func(w http.ResponseWriter, r *http.Request) {

111

func(w http.ResponseWriter, r *http.Request) {

112

if r.URL.Path != "/groups/add" {

112

if r.URL.Path != "/groups/add" {

113

t.Errorf(

113

t.Errorf(

114

"path: got %q, want /groups/add",

114

"path: got %q, want /groups/add",

115

r.URL.Path)

115

r.URL.Path)

116

}

116

}

117

if r.Method != "POST" {

117

if r.Method != "POST" {

118

t.Errorf("method: got %q, want POST", r.Method)

118

t.Errorf("method: got %q, want POST", r.Method)

119

}

119

}

120

json.NewDecoder(r.Body).Decode(&seen)

120

json.NewDecoder(r.Body).Decode(&seen)

121

w.WriteHeader(200)

121

w.WriteHeader(200)

122

}))

122

}))

123

defer srv.Close()

123

defer srv.Close()

124

125

c := NewHTTPClient(srv.URL, "test-key")

125

c := NewHTTPClient(srv.URL, "test-key")

126

err := c.CreateGroup(CreateGroupRequest{

126

err := c.CreateGroup(CreateGroupRequest{

127

Username: "team",

127

Username: "team",

128

Name: "Team",

128

Name: "Team",

129

OwnerUsername: "alice",

129

OwnerUsername: "alice",

130

})

130

})

131

if err != nil {

131

if err != nil {

132

t.Fatal(err)

132

t.Fatal(err)

133

}

133

}

134

if seen.Username != "team" {

134

if seen.Username != "team" {

135

t.Errorf(

135

t.Errorf(

136

"Username: got %q, want team", seen.Username)

136

"Username: got %q, want team", seen.Username)

137

}

137

}

138

if seen.OwnerUsername != "alice" {

138

if seen.OwnerUsername != "alice" {

139

t.Errorf(

139

t.Errorf(

140

"OwnerUsername: got %q, want alice",

140

"OwnerUsername: got %q, want alice",

141

seen.OwnerUsername)

141

seen.OwnerUsername)

142

}

142

}

143

}

143

}

144

145

func TestGroupMembers(t *testing.T) {

146

srv := httptest.NewServer(http.HandlerFunc(

147

func(w http.ResponseWriter, r *http.Request) {

148

if r.URL.Path != "/groups/members" {

149

t.Errorf(

150

"path: got %q, want /groups/members",

151

r.URL.Path)

152

}

153

var body map[string]string

154

json.NewDecoder(r.Body).Decode(&body)

155

if body["owid"] != "team-owid" {

156

t.Errorf(

157

"owid: got %q, want team-owid", body["owid"])

158

}

159

json.NewEncoder(w).Encode(GroupMembersResponse{

160

Down: [][]string{

161

{"alice-owid", "bob-owid"},

162

163

Usernames: map[string]string{

164

"alice-owid": "alice",

165

"bob-owid": "bob",

166

167

})

168

}))

169

defer srv.Close()

170

171

c := NewHTTPClient(srv.URL, "test-key")

172

res, err := c.GroupMembers("team-owid")

173

if err != nil {

174

t.Fatal(err)

175

}

176

if res.Usernames["alice-owid"] != "alice" {

177

t.Errorf(

178

"Usernames[alice-owid]: got %q",

179

res.Usernames["alice-owid"])

180

}

181

}

182

183

func TestLeaveGroup(t *testing.T) {

184

var seen LeaveGroupRequest

185

srv := httptest.NewServer(http.HandlerFunc(

186

func(w http.ResponseWriter, r *http.Request) {

187

if r.URL.Path != "/groups/leave" {

188

t.Errorf(

189

"path: got %q, want /groups/leave",

190

r.URL.Path)

191

}

192

json.NewDecoder(r.Body).Decode(&seen)

193

w.WriteHeader(204)

194

}))

195

defer srv.Close()

196

197

c := NewHTTPClient(srv.URL, "test-key")

198

err := c.LeaveGroup(LeaveGroupRequest{

199

GroupOwid: "team-owid",

200

MemberOwid: "alice-owid",

201

})

202

if err != nil {

203

t.Fatal(err)

204

}

205

if seen.GroupOwid != "team-owid" {

206

t.Errorf(

207

"GroupOwid: got %q", seen.GroupOwid)

208

}

209

if seen.MemberOwid != "alice-owid" {

210

t.Errorf(

211

"MemberOwid: got %q", seen.MemberOwid)

212

}

213

}

214

145

func TestJoinGroups(t *testing.T) {

215

func TestJoinGroups(t *testing.T) {

146

var seen JoinGroupsRequest

216

var seen JoinGroupsRequest

147

srv := httptest.NewServer(http.HandlerFunc(

217

srv := httptest.NewServer(http.HandlerFunc(

148

func(w http.ResponseWriter, r *http.Request) {

218

func(w http.ResponseWriter, r *http.Request) {

149

if r.URL.Path != "/groups/join" {

219

if r.URL.Path != "/groups/join" {

150

t.Errorf(

220

t.Errorf(

151

"path: got %q, want /groups/join",

221

"path: got %q, want /groups/join",

152

r.URL.Path)

222

r.URL.Path)

153

}

223

}

154

if r.Method != "POST" {

224

if r.Method != "POST" {

155

t.Errorf("method: got %q, want POST", r.Method)

225

t.Errorf("method: got %q, want POST", r.Method)

156

}

226

}

157

json.NewDecoder(r.Body).Decode(&seen)

227

json.NewDecoder(r.Body).Decode(&seen)

158

w.WriteHeader(200)

228

w.WriteHeader(200)

159

}))

229

}))

160

defer srv.Close()

230

defer srv.Close()

161

231

162

c := NewHTTPClient(srv.URL, "test-key")

232

c := NewHTTPClient(srv.URL, "test-key")

163

err := c.JoinGroups(JoinGroupsRequest{

233

err := c.JoinGroups(JoinGroupsRequest{

164

GroupUsernames: []string{"team"},

234

GroupUsernames: []string{"team"},

165

MemberUsernames: []string{"alice", "bob"},

235

MemberUsernames: []string{"alice", "bob"},

166

})

236

})

167

if err != nil {

237

if err != nil {

168

t.Fatal(err)

238

t.Fatal(err)

169

}

239

}

170

if len(seen.GroupUsernames) != 1 ||

240

if len(seen.GroupUsernames) != 1 ||

171

seen.GroupUsernames[0] != "team" {

241

seen.GroupUsernames[0] != "team" {

172

t.Errorf(

242

t.Errorf(

173

"GroupUsernames: got %v, want [team]",

243

"GroupUsernames: got %v, want [team]",

174

seen.GroupUsernames)

244

seen.GroupUsernames)

175

}

245

}

176

if len(seen.MemberUsernames) != 2 {

246

if len(seen.MemberUsernames) != 2 {

177

t.Errorf(

247

t.Errorf(

178

"MemberUsernames: got %v, want 2 members",

248

"MemberUsernames: got %v, want 2 members",

179

seen.MemberUsernames)

249

seen.MemberUsernames)

180

}

250

}

181

}

251

}