Skip to content

Commit 32b497d

Browse files
committed
Merge origin/main into claude/distracted-kalam-809418
Resolves Phase 1012 (live event markers + click-to-details) against main's concurrent evolution (~30 commits since the merge-base at 6502d30): Phase 1013 MEX binaries prebuilt Phase 1014 MATLAB test migration for v2.0 Tag API Phase 1015 showcase demo + theme trim Phase 1016 time slider rework PR #61 exclude .planning/ + .superpowers/ from repo (gitignore) PR #62 widget audit bugs PR #66 v2.0 test migration finish PR #69 per-widget render progress bar PR #72 Dashboard toolbar rework Conflict resolution summary: libs/Dashboard/FastSenseWidget.m (4 chunks, manual): - properties block: both sides added properties; kept all (ShowEventMarkers + EventStore + LiveViewMode) - refresh() + update() try blocks: kept both post-updateData actions (obj.refreshEventMarkers_() + obj.formatTimeAxis_(ax)) - private methods: kept both new methods side-by-side (refreshEventMarkers_ and formatTimeAxis_) libs/FastSense/FastSense.m — auto-merged cleanly (31 Phase-1012 markers + 13 main markers present) libs/Dashboard/DashboardTheme.m — auto-merged cleanly (EventMarkerSize=8 preserved) .planning/ + .superpowers/ — untracked via git rm -r --cached per main's PR #61 gitignore policy. Planning artifacts remain on disk for local reference. No test runs yet; recommend running tests/suite/TestEventIsOpen, TestMonitorTagOpenEvent, TestFastSenseEventClick, TestFastSenseWidgetEventMarkers after pulling to verify the merged FastSenseWidget.m still satisfies Phase-1012 contracts alongside main's FormatTimeAxis additions.
2 parents 6ee0348 + a602eed commit 32b497d

570 files changed

Lines changed: 12346 additions & 109408 deletions

File tree

Some content is hidden

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

.github/workflows/_build-mex-octave.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,12 @@ jobs:
2424
with:
2525
path: |
2626
libs/FastSense/private/*.mex
27+
libs/FastSense/private/octave-linux-x86_64/*.mex
28+
libs/FastSense/octave-linux-x86_64/*.mex
2729
libs/SensorThreshold/private/*.mex
30+
libs/SensorThreshold/private/octave-linux-x86_64/*.mex
2831
libs/FastSense/mksqlite.mex
29-
key: mex-linux-${{ hashFiles('libs/FastSense/private/mex_src/**', 'libs/FastSense/build_mex.m') }}
32+
key: mex-linux-${{ hashFiles('libs/FastSense/private/mex_src/**', 'libs/FastSense/build_mex.m', 'libs/FastSense/private/.mex-version') }}
3033

3134
- name: Compile MEX files
3235
if: steps.cache-mex.outputs.cache-hit != 'true'
@@ -38,6 +41,9 @@ jobs:
3841
name: ${{ inputs.artifact-name }}
3942
path: |
4043
libs/FastSense/private/*.mex
44+
libs/FastSense/private/octave-linux-x86_64/*.mex
45+
libs/FastSense/octave-linux-x86_64/*.mex
4146
libs/SensorThreshold/private/*.mex
47+
libs/SensorThreshold/private/octave-linux-x86_64/*.mex
4248
libs/FastSense/mksqlite.mex
4349
retention-days: 1

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: git config --global --add safe.directory /__w/FastSense/FastSense
4646

4747
- name: Store benchmark results
48-
uses: benchmark-action/github-action-benchmark@v1.21.0
48+
uses: benchmark-action/github-action-benchmark@v1.22.0
4949
with:
5050
name: FastSense Performance
5151
tool: customSmallerIsBetter

.github/workflows/claude-agent.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Claude Agent
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
pull_request_review_comment:
7+
types: [created]
8+
issues:
9+
types: [opened, assigned, labeled]
10+
11+
concurrency:
12+
group: claude-${{ github.event.issue.number || github.event.pull_request.number }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
claude:
17+
runs-on: ubuntu-latest
18+
if: |
19+
contains(github.event.comment.body, '@claude') ||
20+
contains(github.event.issue.body, '@claude') ||
21+
contains(github.event.issue.labels.*.name, 'claude') ||
22+
github.event.issue.assignee.login == 'claude'
23+
timeout-minutes: 20
24+
permissions:
25+
contents: write
26+
pull-requests: write
27+
issues: write
28+
steps:
29+
- uses: actions/checkout@v6
30+
31+
- uses: anthropics/claude-code-action@v1
32+
with:
33+
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
34+
github_token: ${{ secrets.WIKI_PAT }}
35+
trigger_phrase: '@claude'
36+
assignee_trigger: 'claude'
37+
label_trigger: 'claude'
38+
claude_args: |
39+
--max-turns 15
40+
--model claude-opus-4-7

.github/workflows/generate-wiki.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)