Skip to content

Commit 6414480

Browse files
committed
Merge remote-tracking branch 'origin/main' into copilot/add-typeahead-preview
2 parents 5f0870a + ac0299e commit 6414480

File tree

152 files changed

+6145
-3019
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+6145
-3019
lines changed

.github/workflows/build-helper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: |
7575
git config --global url.https://github.com/.insteadof ssh://git@github.com/
7676
git config --global url.https://github.com/.insteadof git@github.com:
77-
- uses: nick-fields/retry@v3
77+
- uses: nick-fields/retry@v4
7878
name: npm ci
7979
with:
8080
command: npm ci --no-audit --no-fund
@@ -132,7 +132,7 @@ jobs:
132132
USE_SYSTEM_FPM: true # Ensure that the installed version of FPM is used rather than the bundled one.
133133
SNAPCRAFT_BUILD_ENVIRONMENT: host
134134
# Retry Darwin build in case of notarization failures
135-
- uses: nick-fields/retry@v3
135+
- uses: nick-fields/retry@v4
136136
name: Build (Darwin)
137137
if: matrix.platform == 'darwin'
138138
with:

.github/workflows/bump-version.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Get App Token
32-
uses: actions/create-github-app-token@v2
32+
uses: actions/create-github-app-token@v3
3333
id: app-token
3434
with:
3535
app-id: ${{ vars.WAVE_BUILDER_APPID }}
@@ -44,7 +44,7 @@ jobs:
4444
node-version: ${{env.NODE_VERSION}}
4545
cache: npm
4646
cache-dependency-path: package-lock.json
47-
- uses: nick-fields/retry@v3
47+
- uses: nick-fields/retry@v4
4848
name: npm ci
4949
with:
5050
command: npm ci --no-audit --no-fund

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
node-version: ${{env.NODE_VERSION}}
7777
cache: npm
7878
cache-dependency-path: package-lock.json
79-
- uses: nick-fields/retry@v3
79+
- uses: nick-fields/retry@v4
8080
name: npm ci
8181
with:
8282
command: npm ci --no-audit --no-fund

.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
git config --global url.https://github.com/.insteadof git@github.com:
4949
5050
# Warm caches only (no builds)
51-
- uses: nick-fields/retry@v3
51+
- uses: nick-fields/retry@v4
5252
name: npm ci
5353
with:
5454
command: npm ci --no-audit --no-fund

.github/workflows/deploy-docsite.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
version: 3.x
4545
repo-token: ${{ secrets.GITHUB_TOKEN }}
46-
- uses: nick-fields/retry@v3
46+
- uses: nick-fields/retry@v4
4747
name: npm ci
4848
with:
4949
command: npm ci --no-audit --no-fund
@@ -55,7 +55,7 @@ jobs:
5555
- name: Upload Build Artifact
5656
# Only upload the build artifact when pushed to the main branch
5757
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
58-
uses: actions/upload-pages-artifact@v3
58+
uses: actions/upload-pages-artifact@v4
5959
with:
6060
path: docs/build
6161
deploy:
@@ -77,4 +77,4 @@ jobs:
7777
steps:
7878
- name: Deploy to GitHub Pages
7979
id: deployment
80-
uses: actions/deploy-pages@v4
80+
uses: actions/deploy-pages@v5

.github/workflows/testdriver-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
node-version: ${{env.NODE_VERSION}}
5353
cache: npm
5454
cache-dependency-path: package-lock.json
55-
- uses: nick-fields/retry@v3
55+
- uses: nick-fields/retry@v4
5656
name: npm ci
5757
with:
5858
command: npm ci --no-audit --no-fund

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ test-results.xml
3939
docsite/
4040

4141
.kilo-format-temp-*
42+
.superpowers
43+
docs/superpowers
44+
.claude

.kilocode/skills/create-view/SKILL.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ Create a new file for your view model (e.g., `frontend/app/view/myview/myview-mo
110110

111111
```typescript
112112
import { BlockNodeModel } from "@/app/block/blocktypes";
113-
import { WOS, globalStore, useBlockAtom } from "@/store/global";
113+
import { globalStore } from "@/app/store/jotaiStore";
114+
import { WOS, useBlockAtom } from "@/store/global";
114115
import * as jotai from "jotai";
115116
import { MyView } from "./myview";
116117

@@ -202,9 +203,11 @@ export const MyView: React.FC<ViewComponentProps<MyViewModel>> = ({
202203

203204
### 3. Register the View
204205

205-
Add your view to the `BlockRegistry` in `frontend/app/block/block.tsx`:
206+
Add your view to the `BlockRegistry` in `frontend/app/block/blockregistry.ts`:
206207

207208
```typescript
209+
import { MyViewModel } from "@/app/view/myview/myview-model";
210+
208211
const BlockRegistry: Map<string, ViewModelClass> = new Map();
209212
BlockRegistry.set("term", TermViewModel);
210213
BlockRegistry.set("preview", PreviewModel);

.kilocode/skills/waveenv/SKILL.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Create a narrowing whenever you are writing a component (or group of components)
3030

3131
```ts
3232
import {
33-
BlockMetaKeyAtomFnType, // only if you use getBlockMetaKeyAtom
33+
MetaKeyAtomFnType, // only if you use getBlockMetaKeyAtom or getTabMetaKeyAtom
3434
ConnConfigKeyAtomFnType, // only if you use getConnConfigKeyAtom
3535
SettingsKeyAtomFnType, // only if you use getSettingsKeyAtom
3636
WaveEnv,
@@ -77,12 +77,14 @@ export type MyEnv = WaveEnvSubset<{
7777

7878
// --- key-parameterized atom factories: enumerate the keys you use ---
7979
getSettingsKeyAtom: SettingsKeyAtomFnType<"app:focusfollowscursor" | "window:magnifiedblockopacity">;
80-
getBlockMetaKeyAtom: BlockMetaKeyAtomFnType<"view" | "frame:title" | "connection">;
80+
getBlockMetaKeyAtom: MetaKeyAtomFnType<"view" | "frame:title" | "connection">;
81+
getTabMetaKeyAtom: MetaKeyAtomFnType<"tabid" | "name">;
8182
getConnConfigKeyAtom: ConnConfigKeyAtomFnType<"conn:wshenabled">;
8283

8384
// --- other atom helpers: copy verbatim ---
8485
getConnStatusAtom: WaveEnv["getConnStatusAtom"];
8586
getLocalHostDisplayNameAtom: WaveEnv["getLocalHostDisplayNameAtom"];
87+
getConfigBackgroundAtom: WaveEnv["getConfigBackgroundAtom"];
8688
}>;
8789
```
8890

@@ -104,7 +106,8 @@ Every `WaveEnvSubset<T>` automatically includes the mock fields — you never ne
104106
| `wos` | `wos: WaveEnv["wos"]` | Take the whole `wos` object (no sub-typing needed), but **only add it if `wos` is actually used**. |
105107
| `services` | `services: { svc: WaveEnv["services"]["svc"]; }` | List each service used; take the whole service object (no method-level narrowing). |
106108
| `getSettingsKeyAtom` | `SettingsKeyAtomFnType<"key1" \| "key2">` | Union all settings keys accessed. |
107-
| `getBlockMetaKeyAtom` | `BlockMetaKeyAtomFnType<"key1" \| "key2">` | Union all block meta keys accessed. |
109+
| `getBlockMetaKeyAtom` | `MetaKeyAtomFnType<"key1" \| "key2">` | Union all block meta keys accessed. |
110+
| `getTabMetaKeyAtom` | `MetaKeyAtomFnType<"key1" \| "key2">` | Union all tab meta keys accessed. |
108111
| `getConnConfigKeyAtom` | `ConnConfigKeyAtomFnType<"key1">` | Union all conn config keys accessed. |
109112
| All other `WaveEnv` fields | `WaveEnv["fieldName"]` | Copy type verbatim. |
110113

README.ko.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<div align="center">
1515

16-
[English](README.md) | [한국어](README.ko.md)
16+
[English](README.md) | [한국어](README.ko.md) | [繁體中文](README.zh-TW.md)
1717

1818
</div>
1919

0 commit comments

Comments
 (0)