r1

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [stable, develop]
   pull_request:
-    branches: [main]
+    branches: [stable, develop]
 
 jobs:
   linux:

.gitignore

@@ -5,4 +5,5 @@
 /.vs
 .generated/
 output/
-imgui.ini
+imgui.ini
+.atto/

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.25)
-project(nanolang LANGUAGES C CXX)
+project(attolang LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -12,59 +12,85 @@ if(NOT WIN32)
     endif()
 endif()
 
-option(NANOLANG_BUILD_EDITOR "Build the nanoflow visual editor (requires SDL3 + imgui)" ON)
+option(ATTOLANG_BUILD_EDITOR "Build the attoflow visual editor (requires SDL3 + imgui)" ON)
 
-# nanolang: core language library (no UI dependencies)
-add_library(nanolang STATIC
-    src/nano/types.cpp
-    src/nano/args.cpp
-    src/nano/expr.cpp
-    src/nano/type_utils.cpp
-    src/nano/serial.cpp
-    src/nano/inference.cpp
+# attolang: core language library (no UI dependencies)
+add_library(attolang STATIC
+    src/atto/types.cpp
+    src/atto/args.cpp
+    src/atto/expr.cpp
+    src/atto/type_utils.cpp
+    src/atto/serial.cpp
+    src/atto/inference.cpp
+    src/atto/graph_index.cpp
+    src/atto/shadow.cpp
+    src/atto/symbol_table.cpp
+    src/atto/graph_builder.cpp
 )
-target_include_directories(nanolang PUBLIC
+target_include_directories(attolang PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/nano
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/atto
 )
 
-# nanoc: standalone compiler
-add_executable(nanoc
-    src/nanoc/main.cpp
-    src/nanoc/codegen.cpp
+# attoc: standalone compiler
+add_executable(attoc
+    src/attoc/main.cpp
+    src/attoc/codegen.cpp
 )
-target_include_directories(nanoc PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/nanoc
+target_include_directories(attoc PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/attoc
 )
-target_link_libraries(nanoc PRIVATE
-    nanolang
+target_link_libraries(attoc PRIVATE
+    attolang
 )
 
 # test_inference: unit tests
 add_executable(test_inference
     tests/test_inference.cpp
 )
 target_link_libraries(test_inference PRIVATE
-    nanolang
+    attolang
 )
 
-# nanoflow: visual flow editor (optional, requires SDL3 + imgui)
-if(NANOLANG_BUILD_EDITOR)
-    set(NANO_NEEDS_IMGUI ON)
-    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/NanoDeps.cmake)
+# attoflow: visual flow editor (optional, requires SDL3 + imgui)
+if(ATTOLANG_BUILD_EDITOR)
+    set(ATTO_NEEDS_IMGUI ON)
+    include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/AttoDeps.cmake)
 
-    add_executable(nanoflow
-        src/nanoflow/main.cpp
-        src/nanoflow/editor.cpp
+    # Embed Liberation Mono font as C array
+    set(FONT_TTF "${CMAKE_CURRENT_SOURCE_DIR}/src/attoflow/fonts/LiberationMono-Regular.ttf")
+    set(FONT_HDR "${CMAKE_CURRENT_BINARY_DIR}/generated/LiberationMono_Regular.h")
+    file(READ "${FONT_TTF}" FONT_HEX HEX)
+    string(LENGTH "${FONT_HEX}" FONT_HEX_LEN)
+    math(EXPR FONT_SIZE "${FONT_HEX_LEN} / 2")
+    string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," FONT_BYTES "${FONT_HEX}")
+    file(WRITE "${FONT_HDR}"
+        "// Liberation Mono Regular - SIL Open Font License (auto-generated)\n"
+        "#pragma once\n"
+        "static const unsigned int LiberationMono_Regular_size = ${FONT_SIZE};\n"
+        "static const unsigned char LiberationMono_Regular_data[] = {\n"
+        "${FONT_BYTES}\n};\n"
     )
-    target_include_directories(nanoflow PRIVATE
+
+    add_executable(attoflow
+        src/attoflow/main.cpp
+        src/attoflow/window.cpp
+        src/attoflow/editor2.cpp
+        src/attoflow/nets_editor.cpp
+        src/attoflow/visual_editor.cpp
+        src/attoflow/node_renderer.cpp
+        src/attoflow/tooltip_renderer.cpp
+        src/attoflow/editor_style.cpp
+    )
+    target_include_directories(attoflow PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/nanoflow
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/attoflow
+        ${CMAKE_CURRENT_BINARY_DIR}/generated
     )
     if(WIN32)
-        target_link_libraries(nanoflow PRIVATE nanolang SDL3::SDL3 imgui::imgui)
+        target_link_libraries(attoflow PRIVATE attolang SDL3::SDL3 imgui::imgui)
     else()
-        target_link_libraries(nanoflow PRIVATE nanolang SDL3::SDL3-static imgui_all)
+        target_link_libraries(attoflow PRIVATE attolang SDL3::SDL3-static imgui_all)
     endif()
-    add_dependencies(nanoflow nanoc)
+    add_dependencies(attoflow attoc)
 endif()

README.md

@@ -1,28 +1,36 @@
-# nanolang
+# Organic Assembler
 
-A visual dataflow programming language with a node-based editor, standalone compiler, and runtime. Programs are authored as flow graphs in `.nano` files and compiled to C++. See an [example program](scenes/klavier/main.nano) and the full [language specification](nanolang.md).
+An Operating System for Instruments (Όργανα), written in attolang. Instruments are multimodal dataflow programs — authored as node graphs possibly using the **attoflow** editor, compiled, and run in real time.
 
-![nanolang](https://github.com/skmp/nanolang/blob/main/docs/nanolang.png)
+Each instrument is a self-contained `.atto` program that defines its Functionality. The System compiles these programs runs them with hot-reload support.
+
+<img width="3840" height="2088" alt="nanolang" src="https://github.com/user-attachments/assets/8cdf22fc-34e3-4b70-9df0-a1fdd2024ec4" />
+
+[![Youtube/the Organic Assembler](https://img.youtube.com/vi/ymzuD-oekFM/0.jpg)](https://www.youtube.com/watch?v=ymzuD-oekFM)
+
+Listen to the [introductory podcast](docs/podcasts/introducing-orgasm.md) — *Growing Instruments with the Organic Assembler* ([SoundCloud](https://soundcloud.com/poiitidis/growing-instruments-with-the), [YouTube](https://youtu.be/ymzuD-oekFM)).
+
+See an [example instrument](scenes/klavier/main.atto) and the full [language specification](docs/attolang.md).
 
 ## Components
 
 | Target | Description |
 |--------|-------------|
-| **nanolang** | Core library — type system, expression parser, type inference, serialization |
-| **nanoflow** | Visual node editor (SDL3 + Dear ImGui) |
-| **nanoc** | Standalone compiler (`.nano` → C++) |
-| **nanoruntime** | Runtime with GUI and ImGui bindings |
+| **attolang** | Core language library — type system, expression parser, type inference, serialization |
+| **attoflow** | Visual node editor for authoring instruments (SDL3 + Dear ImGui) |
+| **attoc** | Standalone compiler (`.atto` → C++) |
+| **attoruntime** | Instrument runtime with GUI and audio bindings |
 
 ## Language Highlights
 
-- **Sigil-based value categories** — `%` data, `&` reference, `^` iterator, `@` lambda, `#` enum, `!` bang (trigger), `~` event
 - **Rich type system** — scalars (`u8`–`s64`, `f32`/`f64`, `bool`, `string`), containers (`vector`, `map`, `list`, `set`, `queue`), fixed-size arrays, tensors, named struct types, function types
+- **First-class literals, symbols, and types** — `literal<T,V>`, `symbol<name,type>`, `type<T>` as compile-time values
 - **Bidirectional type inference** with automatic integer upcasting and iterator-to-reference decay
 - **Bang-driven control flow** — nodes postfixed with `!` have explicit execution ordering via bang signals
 - **Inline expressions** — node arguments can embed literals, variable refs, and sub-expressions directly
 - **Lambda construction** — expression nodes can be captured as callable lambdas with automatic capture/parameter resolution
 - **FFI support** — declare external C functions and call them from the graph
-- **Standard library modules** — e.g. `decl_import std/imgui` for ImGui bindings
+- **Standard library modules** — e.g. `decl_import "std/imgui"` for ImGui bindings
 
 ## Building
 
@@ -48,6 +56,12 @@ cmake -B build -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
 cmake --build build --parallel --config Release
 ```
 
+## Instructions
+
+New to the project? Start with the [Instructions](docs/instructions.md) — a guide to interpreting and following instructions, operating on the codebase, and building instruments with the Organic Assembler. It covers everything from the build system and architectural layers to the anatomy of an instrument and the audio callback pattern.
+
+For naming philosophy, see [Names](docs/names.md). For the full documentation suite: [Architecture](docs/architecture.md), [Language Spec](docs/attolang.md), [Patterns](docs/patterns.md), [Thinking](docs/thinking.md), [Style](docs/style.md), [Coding](docs/coding.md), [Changelog](docs/changelog.md).
+
 ## License
 
 MIT — see [LICENSE](LICENSE).

nanostd/gui.nano → attostd/gui.atto

@@ -1,4 +1,4 @@
-# GUI/AV runtime FFI bindings for nanolang
+# GUI/AV runtime FFI bindings for attolang
 # Import with: decl_import std/gui
 
 # Create a window with audio and video callbacks.

nanostd/imgui.nano → attostd/imgui.atto

@@ -1,4 +1,4 @@
-# ImGui FFI bindings for nanolang
+# ImGui FFI bindings for attolang
 # Import with: decl_import std/imgui
 
 # Window management

cmake/NanoDeps.cmake → cmake/AttoDeps.cmake

@@ -1,13 +1,13 @@
-# NanoDeps.cmake — Fetch SDL3 + imgui via FetchContent (non-Windows) or vcpkg (Windows)
+# AttoDeps.cmake — Fetch SDL3 + imgui via FetchContent (non-Windows) or vcpkg (Windows)
 #
 # Provides:
 #   SDL3::SDL3   — SDL3 target
-#   imgui_all    — imgui core + SDL3 backends (only if NANO_NEEDS_IMGUI is set)
+#   imgui_all    — imgui core + SDL3 backends (only if ATTO_NEEDS_IMGUI is set)
 
 if(WIN32)
     # On Windows, use vcpkg (user must set CMAKE_TOOLCHAIN_FILE)
     find_package(SDL3 CONFIG REQUIRED)
-    if(NANO_NEEDS_IMGUI)
+    if(ATTO_NEEDS_IMGUI)
         find_package(imgui CONFIG REQUIRED)
     endif()
 else()
@@ -25,7 +25,7 @@ else()
     set(SDL_TESTS OFF CACHE BOOL "" FORCE)
     FetchContent_MakeAvailable(SDL3)
 
-    if(NANO_NEEDS_IMGUI)
+    if(ATTO_NEEDS_IMGUI)
         FetchContent_Declare(imgui
             GIT_REPOSITORY https://github.com/ocornut/imgui.git
             GIT_TAG        v1.92.6

docs/2026-04-06.md

@@ -0,0 +1,135 @@
+# Continuation — Organic Assembler Session Context
+
+*Date: 2026-04-06*
+
+This file captures the active context, open threads, and memory state for the Organic Assembler project, for use as a handoff document or NotebookLM/LLM context seed.
+
+---
+
+## Project Identity
+
+**Organic Assembler (orgasm)** is an **Operating System for Instruments** — a platform where instruments are multimodal dataflow programs authored as `.atto` node graphs, compiled by `attoc`, and run in real time by `attoruntime`. The visual editor is `attoflow`. The language is `attolang`.
+
+- "Instrument" = a `.atto` program (not just audio — multimodal)
+- "OS" = the runtime + editor + compiler ecosystem managing instrument lifecycle
+- Repo: `nilware-io/orgasm` (GitHub)
+
+---
+
+## Session Work (this conversation)
+
+### Podcast documentation
+- Created [docs/podcasts/introducing-orgasm.md](docs/podcasts/introducing-orgasm.md) — the podcast landing page
+  - Links: [SoundCloud](https://soundcloud.com/poiitidis/growing-instruments-with-the), [YouTube](https://youtu.be/ymzuD-oekFM), and the local [m4a file](docs/podcasts/Growing_instruments_with_the_Organic_Assembler.m4a)
+  - References [notes/introducing-orgasm.md](docs/podcasts/notes/introducing-orgasm.md) as the NotebookLM source
+- Updated [README.md](README.md) to surface the podcast with both SoundCloud and YouTube links, right after the screenshot
+
+---
+
+## Active Project Threads (from memory)
+
+### 1. Type System Redesign (partially complete as of 2026-03-25)
+
+**Completed:**
+- `literal<T,V>` type representation; expression parser produces `ExprKind::Literal` for all literals
+- Removed all legacy ExprKind values (IntLiteral, F32Literal, etc.)
+- `symbol<name,type>` and `undefined_symbol<name>` types
+- `TypeApply`: `$0<$1,$2>` parsed as speculative `<>` on identifiers resolving to types
+- All nodes except `label` get shadow nodes; `decl_var` descriptor redesigned
+- `build_context` and `build_registry` removed — replaced by future `decl` bang chain
+
+**TODO:**
+- Implement `decl` bang chain evaluation (compile-time interpreter)
+- `decl_type` outputs `type<T>`
+- Event names without `~` prefix
+- Namespace `::` operator in expressions
+- Type construction via calling (e.g. `f32(42)` as cast)
+- Rewrite tests for new declaration/inference flow
+
+---
+
+### 2. Editor2 & GraphBuilder Refactor
+
+**Completed:**
+- `BuilderEntry` inheritance base with `IdCategory` (Node/Net)
+- `FlowArg2` inheritance hierarchy: `ArgNet2`, `ArgNumber2`, `ArgString2`, `ArgExpr2`
+- Dirty tracking: `GraphBuilder::mark_dirty()` / `is_dirty()`
+- Sentinels: `$empty` (FlowNodeBuilder), `$unconnected` (NetBuilder)
+- `NodeKind2`: Flow, Banged, Event, Declaration, Special
+- v0→v1 migration: name-based port mapping, shadow folding, lambda `-as_lambda` stripping
+- Hover system: `hover_item_` variant, `detect_hover()`, `draw_hover_effects()`
+- Pin shapes: Circle (data), Square (bang), Triangle (lambda), Diamond (va_args/optional)
+- Liberation Mono font embedded via CMake `file(READ HEX)`
+
+---
+
+### 3. DLL Host & Wire Architecture (design phase)
+
+**attohost.exe:**
+- Separate host process — editor spawns it, it owns SDL window/audio/ImGui
+- attoc generates `.dll` (SHARED); attohost does `LoadLibrary` → `on_start`
+- Crash isolation; hot-reload without restarting editor
+
+**wire\<T\>:**
+- Release: typedef to `T` (zero overhead)
+- Inspect: wraps value with metadata, notifies IPC channel
+- Enables live inspection, value injection, oscilloscope view per wire
+
+**First-class wires in .atto format:**
+- `[[wire]]` top-level entities with `guid`, `from`, `to`
+- Replace current `connections` array on nodes
+- guid stable across node renames — used for inspector subscriptions
+
+**IPC:**
+- attoflow owns named pipe; attohost connects on startup
+- attohost publishes wire table on connect; sends dirty updates per frame
+- attoflow sends back: value overrides, reload signal, shutdown
+
+---
+
+### 4. Nested Lambda Scope Bug (open)
+
+**Problem:** `collect_lambda_params` doesn't respect lambda boundaries — outer stored lambda params leak into inner `lock`/`iterate` lambdas. A `param` node reachable through an inner lambda's subgraph is incorrectly treated as belonging to the inner lambda.
+
+**Proper fix:** Pre-inference pass that:
+1. Identifies all lambda boundaries (every `as_lambda` → Lambda pin connection)
+2. Assigns each node to its innermost lambda scope
+3. `collect_lambda_params` only collects from nodes owned by the current scope
+
+---
+
+### 5. node.args Elimination (future work)
+
+`node.args` is still a string tokenized at runtime ~40+ times across codegen, inference, type_utils, editor, serial. Goal: pre-extract all metadata into structured fields at load time; `node.args` becomes display/serialization only.
+
+Migration order: codegen first (highest call count), then inference, then editor.
+
+---
+
+### 6. Web Target (deferred design)
+
+- Editor compiled to Emscripten, runs in browser
+- "Run" posts `.atto` to compile server on hardened Pi
+- Server: attoc → C++ → emcc → returns `.wasm`
+- Container: no network inside, 60s timeout, 512MB RAM, read-only rootfs
+- Attack surface bounded to `.atto` input (no arbitrary C++ injection)
+
+---
+
+## Key Files
+
+| Path | Purpose |
+|------|---------|
+| [README.md](README.md) | Project overview, components, build instructions |
+| [docs/attolang.md](docs/attolang.md) | Full language specification |
+| [docs/architecture.md](docs/architecture.md) | Architectural layers |
+| [docs/instructions.md](docs/instructions.md) | Guide for operating on the codebase |
+| [docs/patterns.md](docs/patterns.md) | Instrument patterns |
+| [docs/thinking.md](docs/thinking.md) | Design philosophy |
+| [docs/style.md](docs/style.md) | Code style |
+| [docs/coding.md](docs/coding.md) | Coding conventions |
+| [docs/changelog.md](docs/changelog.md) | Change history |
+| [docs/names.md](docs/names.md) | Naming philosophy |
+| [docs/podcasts/introducing-orgasm.md](docs/podcasts/introducing-orgasm.md) | Podcast landing page |
+| [docs/podcasts/notes/introducing-orgasm.md](docs/podcasts/notes/introducing-orgasm.md) | NotebookLM source notes |
+| [scenes/klavier/main.atto](scenes/klavier/main.atto) | Example instrument |