From 97a93d3393f0bbdf141bce35ec80390ef09e5d39 Mon Sep 17 00:00:00 2001 From: Eric Rakestraw Date: Wed, 18 Nov 2026 04:08:43 +0000 Subject: [PATCH] Honor remote session authoring updates after publication --- docs/config.md | 11 ++++--- docs/internal/stage-publish.md | 5 +-- docs/roadmap/remediation.md | 4 +++ internal/app/config_loader.go | 32 +++++++++++-------- .../app/prepared_session_roundtrip_test.go | 23 +++++++++++++ 5 files changed, 56 insertions(+), 19 deletions(-) diff --git a/docs/config.md b/docs/config.md index c61162a..b599a65 100644 --- a/docs/config.md +++ b/docs/config.md @@ -43,12 +43,15 @@ When `--session` is omitted, local search order is: 2. `/etc/narratio/session.yml` If no local session exists and a `session_id` is known, Narratio loads the -session from configured object storage. It selects the prepared session in the -current committed run when available; if no current pointer exists or an older -commit has no prepared session, it falls back to the session-init `session.yml` -object. Downloaded session bytes are contextless snapshots, with remote object +session from configured object storage. Downloaded session bytes are contextless +snapshots, with remote object provenance retained independently of locally materialized checksums. +Remote loading prefers an authored session-root `session.yml`, including updates +from `session init --remote --force`. When that object is absent, loading falls +back to the current commit's standalone prepared session. Published snapshots +remain immutable; restore validates the pointer-selected committed state. + ### Read-only effective pipeline inspection `narratio config validate`, `narratio config show`, `narratio config sources`, diff --git a/docs/internal/stage-publish.md b/docs/internal/stage-publish.md index 6889820..a8da561 100644 --- a/docs/internal/stage-publish.md +++ b/docs/internal/stage-publish.md @@ -35,8 +35,9 @@ remote verification live in `publish_transfer.go`; committed-manifest, immutable-commit, and current-pointer encoding and writes live in `publish_commit.go`. `publish_output_plan.go` owns the deterministic, I/O-free five-outcome model and its secret-free metadata projection. Prepared input -objects are committed under the immutable run; remote session loading selects -the committed standalone session through the current pointer. +objects are committed under the immutable run; the committed standalone session +supports remote loading when no authored session override is available. The +[configuration reference](../config.md#sessionyml) owns input selection. - when publishing or run upload is disabled, completes successfully with no outputs and records explanatory metadata. This is not an explicit self-skip: diff --git a/docs/roadmap/remediation.md b/docs/roadmap/remediation.md index 2291c5e..066849a 100644 --- a/docs/roadmap/remediation.md +++ b/docs/roadmap/remediation.md @@ -189,6 +189,10 @@ configuration owner without adding remote companion retrieval. ## 6. P2: Reconcile remote session updates with committed-session selection +Status: Complete. Authored remote input takes precedence for later commands; +committed snapshots remain immutable fallback input and restore authority. +Publication/update regression coverage checks changed title and audio selection. + Stage: 7, interacting with the existing initializer and shared command loader from Stages 2 and 4. diff --git a/internal/app/config_loader.go b/internal/app/config_loader.go index a6bd653..54010ae 100644 --- a/internal/app/config_loader.go +++ b/internal/app/config_loader.go @@ -192,23 +192,29 @@ func loadPipelineConfigWithDependencies(pipelineFlag string, opts config.Pipelin } func findRemoteSessionConfig(ctx context.Context, store storage.ObjectStore, sessionPrefix, remoteKey, campaign, sessionID string) (storage.ObjectInfo, string, error) { - current, err := artifacts.LoadCurrentState(ctx, store, sessionPrefix, artifacts.CurrentStateValidation{ExpectedCampaign: campaign, ExpectedSessionID: sessionID, ValidateRunID: true}) + authored, err := store.Exists(ctx, remoteKey) + if err != nil { + return storage.ObjectInfo{}, "", fmt.Errorf("check authored session %q: %w", remoteKey, err) + } var selected *artifacts.RemoteArtifact - if err == nil { - for _, item := range current.Commit.Artifacts { - if item.Type == artifacts.RemoteArtifactTypeRunFile && item.Source == "run:prepare/inputs/session.yml" { - identity, err := artifacts.ParseImmutableRunObjectKey(sessionPrefix, item.DestinationKey) - if err != nil || "run:"+identity.RelativePath != item.Source { - return storage.ObjectInfo{}, "", fmt.Errorf("committed session source does not match its object key") + if !authored { + current, err := artifacts.LoadCurrentState(ctx, store, sessionPrefix, artifacts.CurrentStateValidation{ExpectedCampaign: campaign, ExpectedSessionID: sessionID, ValidateRunID: true}) + if err == nil { + for _, item := range current.Commit.Artifacts { + if item.Type == artifacts.RemoteArtifactTypeRunFile && item.Source == "run:prepare/inputs/session.yml" { + identity, err := artifacts.ParseImmutableRunObjectKey(sessionPrefix, item.DestinationKey) + if err != nil || "run:"+identity.RelativePath != item.Source { + return storage.ObjectInfo{}, "", fmt.Errorf("committed session source does not match its object key") + } + copy := item + selected = © + remoteKey = item.DestinationKey + break } - copy := item - selected = © - remoteKey = item.DestinationKey - break } + } else if !errors.Is(err, artifacts.ErrCurrentCommitPointerMissing) { + return storage.ObjectInfo{}, "", fmt.Errorf("load remote session selection: %w", err) } - } else if !errors.Is(err, artifacts.ErrCurrentCommitPointerMissing) { - return storage.ObjectInfo{}, "", fmt.Errorf("load remote session selection: %w", err) } objects, err := store.List(ctx, sessionPrefix) if err != nil { diff --git a/internal/app/prepared_session_roundtrip_test.go b/internal/app/prepared_session_roundtrip_test.go index be2c4f8..9084acc 100644 --- a/internal/app/prepared_session_roundtrip_test.go +++ b/internal/app/prepared_session_roundtrip_test.go @@ -120,6 +120,29 @@ func TestPreparedSessionPublishAndRemoteLoad(t *testing.T) { if err != nil || string(restored) != string(fake.Objects[key].Data) { t.Fatalf("restored session = %q, %v", restored, err) } + committedBytes := string(fake.Objects[key].Data) + if err := sessionInitWithDependencies(ctx, []string{m.SessionID, "--config", pipelinePath, "--campaign-file", campaignPath, "--remote", "--force", "--title", "Updated title", "--audio-s3-prefix", "replacement/"}, &output, deps); err != nil { + t.Fatal(err) + } + updated, err := loadCommandConfigWithDependencies(ctx, pipelinePath, "", campaignPath, "", config.SessionLoadOptions{SessionID: m.SessionID}, nil, deps) + if err != nil { + t.Fatal(err) + } + defer func() { _ = updated.Close() }() + if updated.Config.Session.Title != "Updated title" || updated.Config.Session.Inputs.AudioS3 == nil || updated.Config.Session.Inputs.AudioS3.Prefix != "replacement/" { + t.Fatalf("remote edit ignored: %#v", updated.Config.Session) + } + if string(fake.Objects[key].Data) != committedBytes { + t.Fatal("authoring update changed committed input") + } + if _, err := discoverRemoteCurrentState(ctx, updated.Config, fake); err != nil { + t.Fatalf("committed state after authoring update: %v", err) + } + // Remove the authored override to exercise committed-snapshot integrity below. + rootKey := artifacts.S3SessionConfigKey(prefix) + if err := fake.Delete(ctx, rootKey); err != nil { + t.Fatal(err) + } object := fake.Objects[key] modified := append([]byte(nil), object.Data...) modified[0] ^= 1