kiwi-code 0.0.447__tar.gz → 0.0.449__tar.gz

kiwi_code-0.0.449/.github/workflows/publish.yml

@@ -0,0 +1,128 @@
+name: Publish to PyPI
+
+run-name: "Publish ${{ github.event.inputs.package && format('{0} {1}', github.event.inputs.package, github.event.inputs.version) || github.ref_name }}"
+
+# kiwi-ai and kiwi-code are both built from main. The tag (or the manual inputs)
+# says which one to publish:
+#   git tag kiwi-ai-v0.0.25   && git push origin kiwi-ai-v0.0.25
+#   git tag kiwi-code-v0.0.449 && git push origin kiwi-code-v0.0.449
+on:
+  workflow_dispatch:
+    inputs:
+      package:
+        description: 'Package to publish'
+        required: true
+        type: choice
+        options:
+          - kiwi-ai
+          - kiwi-code
+      version:
+        description: 'Version to publish (e.g., 0.1.1)'
+        required: true
+        type: string
+  push:
+    tags:
+      - 'kiwi-ai-v*.*.*'
+      - 'kiwi-code-v*.*.*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v4
+
+      - name: Set up Python
+        run: uv python install 3.13
+
+      - name: Determine package and version
+        id: release
+        env:
+          INPUT_PACKAGE: ${{ github.event.inputs.package }}
+          INPUT_VERSION: ${{ github.event.inputs.version }}
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            PACKAGE="$INPUT_PACKAGE"
+            VERSION="$INPUT_VERSION"
+          else
+            # kiwi-code-v0.0.449 -> kiwi-code, 0.0.449
+            PACKAGE="${GITHUB_REF_NAME%-v*}"
+            VERSION="${GITHUB_REF_NAME##*-v}"
+          fi
+          echo "package=$PACKAGE" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Prepare ${{ steps.release.outputs.package }} build
+        run: |
+          python3 scripts/set_edition.py "${{ steps.release.outputs.package }}" "${{ steps.release.outputs.version }}"
+          grep -E '^(name|version) = ' pyproject.toml
+          cat src/kiwi_cli/_edition.py
+
+      - name: Install dependencies
+        run: uv sync
+
+      - name: Smoke test
+        env:
+          # Prevent any re-exec / process-renaming logic from interfering with CI.
+          _KIWI_PROC_RENAMED: "1"
+          KIWI_DISABLE_REEXEC: "1"
+        run: |
+          uv run kiwicli --help
+          uv run kiwi --help
+          uv run kiwi-runtime --help
+          uv run python -c "import kiwi_cli, kiwi_tui, kiwi_runtime; print('imports ok')"
+
+      - name: Build package
+        run: uv build
+
+      - name: Verify build artifacts
+        env:
+          PACKAGE: ${{ steps.release.outputs.package }}
+          VERSION: ${{ steps.release.outputs.version }}
+        run: |
+          ls -lh dist/
+          # Artifact names normalize the dash: kiwi-code -> kiwi_code
+          PREFIX="${PACKAGE//-/_}-${VERSION}"
+          for f in "dist/${PREFIX}.tar.gz" "dist/${PREFIX}-py3-none-any.whl"; do
+            if [ ! -f "$f" ]; then
+              echo "ERROR: expected $f"
+              exit 1
+            fi
+          done
+          # Install the wheel on its own and check it identifies as the right product.
+          uv run --isolated --no-project --with "dist/${PREFIX}-py3-none-any.whl" python - <<'EOF'
+          import os
+          from kiwi_cli.edition import EDITION, BACKEND_URL, VERSION
+          print(f"built: {EDITION} {VERSION} -> {BACKEND_URL}")
+          assert EDITION == os.environ["PACKAGE"], EDITION
+          assert VERSION == os.environ["VERSION"], VERSION
+          EOF
+
+      # Each package has its own PyPI token; pick it from the package actually built.
+      - name: Select PyPI token
+        id: pypi
+        run: |
+          PACKAGE=$(python3 -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['name'])")
+          case "$PACKAGE" in
+            kiwi-ai)   SECRET=PYPI_TOKEN_KIWI_AI ;;
+            kiwi-code) SECRET=PYPI_TOKEN_KIWI_CODE ;;
+            *)
+              echo "ERROR: no PyPI token configured for package '$PACKAGE'"
+              exit 1
+              ;;
+          esac
+          echo "Publishing $PACKAGE with secret $SECRET"
+          echo "secret=$SECRET" >> "$GITHUB_OUTPUT"
+
+      - name: Publish to PyPI
+        env:
+          UV_PUBLISH_TOKEN: ${{ secrets[steps.pypi.outputs.secret] }}
+        run: |
+          if [ -z "$UV_PUBLISH_TOKEN" ]; then
+            echo "ERROR: repository secret ${{ steps.pypi.outputs.secret }} is not set"
+            exit 1
+          fi
+          uv publish

{kiwi_code-0.0.447 → kiwi_code-0.0.449}/.github/workflows/test.yml

@@ -12,13 +12,21 @@ concurrency:
 
 jobs:
   test:
-    name: pytest · py${{ matrix.python-version }} · ${{ matrix.os }}
+    name: pytest · ${{ matrix.edition }} · py${{ matrix.python-version }} · ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
         python-version: ["3.11", "3.12", "3.13"]
+        edition: [kiwi-ai]
+        # kiwi-code is built from the same code; run the suite once as kiwi-code too.
+        include:
+          - os: ubuntu-latest
+            python-version: "3.13"
+            edition: kiwi-code
+    env:
+      KIWI_EDITION: ${{ matrix.edition }}
 
     steps:
       - uses: actions/checkout@v4

{kiwi_code-0.0.447 → kiwi_code-0.0.449}/PKG-INFO

@@ -1,8 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: kiwi-code
-Version: 0.0.447
+Version: 0.0.449
 Summary: A textual-based terminal user interface application
-Project-URL: Homepage, https://meetkiwi.ai
+Project-URL: Homepage, https://kiwicode.ai
 Author-email: Anurag <anurag@meetkiwi.co>
 License: Proprietary
 Keywords: cli,terminal,textual,tui
@@ -14,11 +14,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <4.0,>=3.11
-Requires-Dist: autobots-client==0.1.1
+Requires-Dist: codeglass>=0.1.2
 Requires-Dist: httpx>=0.25.0
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: pydantic>=2.12.5
+Requires-Dist: pykiwiai==0.0.13
 Requires-Dist: setproctitle>=1.3.0
 Requires-Dist: textual-dev>=1.8.0
 Requires-Dist: textual>=8.1.1
@@ -47,18 +48,53 @@ Primary entrypoints:
 ### 1) Install
 
 ```bash
-pip install kiwi-code
+pip install kiwi-code   # defaults to a Work account (app.meetkiwi.ai)
+pip install kiwi-ai     # defaults to a Personal account (kiwicode.ai)
 ```
 
+Both packages are built from this repository and provide the same commands. Install one or the other, not both.
+
 ### 2) Log in from the terminal
 
 ```bash
 kiwi login
 ```
 
-This prompts for your email and password and stores tokens at:
+Kiwi has two kinds of account, on separate servers. Login asks which one you have:
+
+| Choice | Account | Sign-in |
+|---|---|---|
+| 1 | Work (app.meetkiwi.ai) | email and password |
+| 2 | Personal (kiwicode.ai) | email and password, Google, Outlook |
+
+The default is Personal for kiwi-ai and Work for kiwi-code.
+
+To skip the question, name the account:
+
+```bash
+kiwi login --account work
+kiwi login --account personal
+```
+
+Login then prompts for your email and password. Each server keeps its own login file, so
+you can be signed in to both accounts at once:
+
+| Server | Login file |
+|---|---|
+| Personal (kiwicode.ai) | `~/.kiwi/tokens.json` |
+| Work (app.meetkiwi.ai) | `~/.kiwi/tokens-work.json` |
+| dev | `~/.kiwi/tokens-dev.json` |
+| local or a URL | `~/.kiwi/tokens-<host>.json` |
+
+To use both side by side, name the account in each terminal:
 
-- `~/.kiwi/tokens.json`
+```bash
+kiwi --account work        # one tab
+kiwi --account personal    # another tab
+```
+
+With no `--account` or `--server`, a command uses the account you logged in to most
+recently (remembered in `~/.kiwi/server`).
 
 You can inspect auth state anytime with:
 
@@ -69,7 +105,9 @@ kiwi whoami
 To clear saved credentials:
 
 ```bash
-kiwi logout
+kiwi logout                  # the account you logged in to most recently
+kiwi logout --account work   # one account
+kiwi logout --all            # every account
 ```
 
 ### 3) Launch the TUI (unchanged default)
@@ -86,9 +124,11 @@ kiwi --server dev
 
 Available presets:
 
-- `app` (prod)
-- `dev` (dev)
-- `local` (localhost)
+- `app` (prod): Personal (kiwicode.ai) for kiwi-ai and Work (app.meetkiwi.ai) for kiwi-code; `--account work` / `--account personal` pick Work / Personal in either
+- `dev` (dev): `dev.api.myautobots.com`, for every account
+- `local` (localhost): `localhost:8000`, for every account
+
+`--server` also takes a full URL, for example `--server http://localhost:9000`.
 
 ### 4) Use terminal mode instead of the full-screen TUI
 
@@ -325,7 +365,22 @@ kiwi --terminal --no-stream --run-id <RUN_ID> "Continue"
 ```
 
 - `--server`: `app | dev | local | <full url>`
-- `--scope`: `restricted | full`
+- `--account`: `work | personal`. Picks the server when `--server` is `app` or not given.
+  On `dev`, `local` or a URL the server stays the same, and the account only decides how
+  to sign in: a work account has email and password, no Google or Outlook.
+
+| `--server` | `--account` | Connects to |
+|---|---|---|
+| not given | not given | the server you logged in to; at login, asks Work or Personal (default: Personal for kiwi-ai, Work for kiwi-code) |
+| not given, or `app` | `work` | Work (app.meetkiwi.ai) |
+| not given, or `app` | `personal` | Personal (kiwicode.ai) |
+| `app` | not given | Personal (kiwicode.ai) for kiwi-ai, Work (app.meetkiwi.ai) for kiwi-code |
+| `dev` | any | `dev.api.myautobots.com` |
+| `local` | any | `localhost:8000` |
+| a URL | any | that URL |
+- `--scope`: `restricted | full`. In the TUI you can also click the mode to switch it: the
+  `Mode:` line on the login screen, or `mode:restricted` in the top bar once signed in.
+  Switching replaces the current run's runtime with one in the new mode.
 - `--allow PATH`: repeatable; additional allowed directories in restricted mode
 - `--terminal`: run Kiwi in plain terminal mode instead of the full-screen TUI
 - `--action-id`: start a fresh conversation for the given action
@@ -361,13 +416,17 @@ uv run python -m kiwi_runtime.main connect --server dev --scope restricted --all
 
 Notes:
 - `--server` supports presets: `app`, `dev`, `local` (or a full URL).
+- `--account work|personal` picks the account; see [Server / flags](#server--flags). With
+  neither `--server`, `--account` nor `--token`, the runtime asks which account before login.
+- `--login google|outlook` is for Personal (kiwicode.ai) accounts only.
 - `--scope restricted` is the default; use `--allow` to add directories.
 - The runtime prints connection status and will remain running until you stop it.
 
 ### Authentication
 
-The runtime typically needs an access token. When you run the TUI and log in, your token is saved to:
-- `~/.kiwi/tokens.json`
+The runtime typically needs an access token. When you run the TUI and log in, your token is saved to the login file of that
+server (`~/.kiwi/tokens.json` for personal, `~/.kiwi/tokens-work.json` for work; see
+[Log in](#2-log-in-from-the-terminal)).
 
 You can pass the token explicitly (if required by your setup):
 
@@ -415,12 +474,26 @@ uv sync
 uv run python -m kiwi_tui.main --server dev
 ```
 
+A checkout runs as kiwi-ai (`src/kiwi_cli/_edition.py`). Set `KIWI_EDITION=kiwi-code` to run it as kiwi-code.
+
 Run tests:
 
 ```bash
 uv run python -m pytest -q
+KIWI_EDITION=kiwi-code uv run python -m pytest -q
 ```
 
+## Releasing
+
+kiwi-ai and kiwi-code are both published from `main`. The differences between them (package name, default backend, author) live in `EDITIONS` in `src/kiwi_cli/edition.py`. Push a tag naming the package and version:
+
+```bash
+git tag kiwi-code-v0.0.449 && git push origin kiwi-code-v0.0.449
+git tag kiwi-ai-v0.0.25    && git push origin kiwi-ai-v0.0.25
+```
+
+The publish workflow runs `scripts/set_edition.py` to stamp the package name, version and edition into the build, checks the built wheel, and publishes with that package's token (`PYPI_TOKEN_KIWI_CODE` or `PYPI_TOKEN_KIWI_AI`). You can also run it manually from the Actions tab by choosing the package and version.
+
 ---
 
 ## License

{kiwi_code-0.0.447 → kiwi_code-0.0.449}/README.md

@@ -18,18 +18,53 @@ Primary entrypoints:
 ### 1) Install
 
 ```bash
-pip install kiwi-code
+pip install kiwi-code   # defaults to a Work account (app.meetkiwi.ai)
+pip install kiwi-ai     # defaults to a Personal account (kiwicode.ai)
 ```
 
+Both packages are built from this repository and provide the same commands. Install one or the other, not both.
+
 ### 2) Log in from the terminal
 
 ```bash
 kiwi login
 ```
 
-This prompts for your email and password and stores tokens at:
+Kiwi has two kinds of account, on separate servers. Login asks which one you have:
+
+| Choice | Account | Sign-in |
+|---|---|---|
+| 1 | Work (app.meetkiwi.ai) | email and password |
+| 2 | Personal (kiwicode.ai) | email and password, Google, Outlook |
+
+The default is Personal for kiwi-ai and Work for kiwi-code.
+
+To skip the question, name the account:
+
+```bash
+kiwi login --account work
+kiwi login --account personal
+```
+
+Login then prompts for your email and password. Each server keeps its own login file, so
+you can be signed in to both accounts at once:
+
+| Server | Login file |
+|---|---|
+| Personal (kiwicode.ai) | `~/.kiwi/tokens.json` |
+| Work (app.meetkiwi.ai) | `~/.kiwi/tokens-work.json` |
+| dev | `~/.kiwi/tokens-dev.json` |
+| local or a URL | `~/.kiwi/tokens-<host>.json` |
+
+To use both side by side, name the account in each terminal:
 
-- `~/.kiwi/tokens.json`
+```bash
+kiwi --account work        # one tab
+kiwi --account personal    # another tab
+```
+
+With no `--account` or `--server`, a command uses the account you logged in to most
+recently (remembered in `~/.kiwi/server`).
 
 You can inspect auth state anytime with:
 
@@ -40,7 +75,9 @@ kiwi whoami
 To clear saved credentials:
 
 ```bash
-kiwi logout
+kiwi logout                  # the account you logged in to most recently
+kiwi logout --account work   # one account
+kiwi logout --all            # every account
 ```
 
 ### 3) Launch the TUI (unchanged default)
@@ -57,9 +94,11 @@ kiwi --server dev
 
 Available presets:
 
-- `app` (prod)
-- `dev` (dev)
-- `local` (localhost)
+- `app` (prod): Personal (kiwicode.ai) for kiwi-ai and Work (app.meetkiwi.ai) for kiwi-code; `--account work` / `--account personal` pick Work / Personal in either
+- `dev` (dev): `dev.api.myautobots.com`, for every account
+- `local` (localhost): `localhost:8000`, for every account
+
+`--server` also takes a full URL, for example `--server http://localhost:9000`.
 
 ### 4) Use terminal mode instead of the full-screen TUI
 
@@ -296,7 +335,22 @@ kiwi --terminal --no-stream --run-id <RUN_ID> "Continue"
 ```
 
 - `--server`: `app | dev | local | <full url>`
-- `--scope`: `restricted | full`
+- `--account`: `work | personal`. Picks the server when `--server` is `app` or not given.
+  On `dev`, `local` or a URL the server stays the same, and the account only decides how
+  to sign in: a work account has email and password, no Google or Outlook.
+
+| `--server` | `--account` | Connects to |
+|---|---|---|
+| not given | not given | the server you logged in to; at login, asks Work or Personal (default: Personal for kiwi-ai, Work for kiwi-code) |
+| not given, or `app` | `work` | Work (app.meetkiwi.ai) |
+| not given, or `app` | `personal` | Personal (kiwicode.ai) |
+| `app` | not given | Personal (kiwicode.ai) for kiwi-ai, Work (app.meetkiwi.ai) for kiwi-code |
+| `dev` | any | `dev.api.myautobots.com` |
+| `local` | any | `localhost:8000` |
+| a URL | any | that URL |
+- `--scope`: `restricted | full`. In the TUI you can also click the mode to switch it: the
+  `Mode:` line on the login screen, or `mode:restricted` in the top bar once signed in.
+  Switching replaces the current run's runtime with one in the new mode.
 - `--allow PATH`: repeatable; additional allowed directories in restricted mode
 - `--terminal`: run Kiwi in plain terminal mode instead of the full-screen TUI
 - `--action-id`: start a fresh conversation for the given action
@@ -332,13 +386,17 @@ uv run python -m kiwi_runtime.main connect --server dev --scope restricted --all
 
 Notes:
 - `--server` supports presets: `app`, `dev`, `local` (or a full URL).
+- `--account work|personal` picks the account; see [Server / flags](#server--flags). With
+  neither `--server`, `--account` nor `--token`, the runtime asks which account before login.
+- `--login google|outlook` is for Personal (kiwicode.ai) accounts only.
 - `--scope restricted` is the default; use `--allow` to add directories.
 - The runtime prints connection status and will remain running until you stop it.
 
 ### Authentication
 
-The runtime typically needs an access token. When you run the TUI and log in, your token is saved to:
-- `~/.kiwi/tokens.json`
+The runtime typically needs an access token. When you run the TUI and log in, your token is saved to the login file of that
+server (`~/.kiwi/tokens.json` for personal, `~/.kiwi/tokens-work.json` for work; see
+[Log in](#2-log-in-from-the-terminal)).
 
 You can pass the token explicitly (if required by your setup):
 
@@ -386,12 +444,26 @@ uv sync
 uv run python -m kiwi_tui.main --server dev
 ```
 
+A checkout runs as kiwi-ai (`src/kiwi_cli/_edition.py`). Set `KIWI_EDITION=kiwi-code` to run it as kiwi-code.
+
 Run tests:
 
 ```bash
 uv run python -m pytest -q
+KIWI_EDITION=kiwi-code uv run python -m pytest -q
 ```
 
+## Releasing
+
+kiwi-ai and kiwi-code are both published from `main`. The differences between them (package name, default backend, author) live in `EDITIONS` in `src/kiwi_cli/edition.py`. Push a tag naming the package and version:
+
+```bash
+git tag kiwi-code-v0.0.449 && git push origin kiwi-code-v0.0.449
+git tag kiwi-ai-v0.0.25    && git push origin kiwi-ai-v0.0.25
+```
+
+The publish workflow runs `scripts/set_edition.py` to stamp the package name, version and edition into the build, checks the built wheel, and publishes with that package's token (`PYPI_TOKEN_KIWI_CODE` or `PYPI_TOKEN_KIWI_AI`). You can also run it manually from the Actions tab by choosing the package and version.
+
 ---
 
 ## License