chore: auto-sync develop → main (merge conflict) by tomasz-blasz · Pull Request #96 · rdkcentral/firebolt-cpp-transport

tomasz-blasz · 2026-06-23T14:04:19Z

Automatic sync of develop → main could not complete via direct workflow push.

Action required: resolve the conflicts in this PR, then merge it.

Detected reason: merge conflict

Triggered by: c959eb3 on develop

…nto feature/openspec

This reverts commit 6fe772c.

…t into openspec-guidelines

…port into openspec-guidelines

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

- Pin _project_template_ Slidev deps to semver ranges (was 'latest') - Fix scan_code_for_spec_comments() docstring to match actual return type (set of file paths) - Expand header_support_spec.md to full openspec template (add Architecture/Design, External Interfaces, Performance, Security, Versioning & Compatibility, Conformance Testing & Validation, Covered Code, Open Queries, Change History sections) - Regenerate spec_coverage.md (was stale; now shows 6/6 specs complete)

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

…ext, add OpenSpec attribution - Remove presentations/openspec-with-copliot-experience/openspec-ssd-dark.pdf (binary files not stored per RDLM policy; markdown slides are sufficient) - Append MIT License boilerplate to LICENSE (generic YEAR/COPYRIGHT HOLDER per reviewer request) - Append OpenSpec attribution to NOTICE

feat: Openspec guidelines

Copilot

Pull request overview

This PR syncs develop into main and brings in a header-support feature for the WebSocket transport (custom request headers + response header retrieval), along with OpenSpec documentation/automation assets and Slidev presentation materials.

Changes:

Added custom header injection during Transport::connect() and cached response header retrieval via getResponseHeader().
Extended public IGateway (and tests/mocks) to expose response header lookup; added Config.headers.
Added OpenSpec specs/skills/prompts plus Slidev presentation projects and generated coverage/report artifacts.

Reviewed changes

Copilot reviewed 44 out of 46 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
test/unit/transportTest.cpp	Adds an integration test for header injection/response header retrieval.
test/unit/helperTest.cpp	Updates `MockGateway` to satisfy new `IGateway::getResponseHeader()` API.
src/transport.h	Extends `Transport::connect()` to accept headers; stores response headers + mutex; declares `getResponseHeader()`.
src/transport.cpp	Injects headers into websocketpp handshake; caches response headers on open; implements `getResponseHeader()`.
src/gateway.cpp	Forwards `Config.headers` into transport connect; exposes `getResponseHeader()` via `IGateway` impl.
spec_coverage.md	Adds generated OpenSpec coverage report output.
README.md	Documents header support usage and API examples.
presentations/transport-slides/slides.md	Adds Slidev deck content for transport overview.
presentations/transport-slides/package.json	Adds Slidev project configuration for transport slides.
presentations/openspec-with-copliot-experience/slides.md	Adds Slidev deck describing OpenSpec + Copilot workflow.
presentations/openspec-with-copliot-experience/package.json	Adds Slidev project configuration for OpenSpec deck.
package.json	Adds root Node dev dependency (Playwright Chromium).
openspec/specs/transport_recommendations_spec.md	Adds OpenSpec recommendations spec.
openspec/specs/transport_layer_spec.md	Adds OpenSpec transport layer spec.
openspec/specs/json_rpc_handling_spec.md	Adds OpenSpec JSON-RPC handling spec.
openspec/specs/header_interfaces_spec.md	Adds OpenSpec header-interfaces spec.
openspec/specs/cpp_specifics_spec.md	Adds OpenSpec C++ specifics spec.
openspec/config.yaml	Adds OpenSpec project configuration and artifact rules.
openspec/changes/archive/2026-03-16-add-header-support/tasks.md	Archives tasks for the header-support change.
openspec/changes/archive/2026-03-16-add-header-support/specs/header_support_spec.md	Archives the header-support specification.
openspec/changes/archive/2026-03-16-add-header-support/design.md	Archives design notes for header support.
openspec/changes/archive/2026-03-16-add-header-support/add_header_support_proposal.md	Archives proposal for header support.
NOTICE	Adds third-party notice for OpenSpec material under MIT.
LICENSE	Appends MIT license text (currently with placeholder copyright line).
include/firebolt/gateway.h	Extends public `IGateway` API with `getResponseHeader()`.
include/firebolt/config.h.in	Adds `Config.headers` and `<map>` include.
.gitignore	Ignores `pnpm-lock.yaml` files.
.github/skills/openspec-templater/spec_template.md	Adds standard spec template used by OpenSpec tooling.
.github/skills/openspec-templater/SKILL.md	Adds skill definition for templating specs.
.github/skills/openspec-propose/SKILL.md	Adds skill definition for proposing OpenSpec changes.
.github/skills/openspec-explore/SKILL.md	Adds skill definition for OpenSpec explore mode.
.github/skills/openspec-coverage/SKILL.md	Adds skill definition for coverage scoring.
.github/skills/openspec-coverage/openspec_coverage.py	Adds Python implementation for generating spec coverage report.
.github/skills/openspec-archive-change/SKILL.md	Adds skill definition for archiving OpenSpec changes.
.github/skills/openspec-apply-change/SKILL.md	Adds skill definition for applying OpenSpec changes.
.github/skills/init-slidedev-project/SKILL.md	Adds skill definition for initializing Slidev projects.
.github/skills/export-presentation/SKILL.md	Adds skill definition for exporting Slidev presentations.
.github/skills/add-slide/SKILL.md	Adds skill definition for inserting slides.
.github/skills/add-diagram/SKILL.md	Adds skill definition for inserting Mermaid diagrams.
.github/release/package-lock.json	Updates release lockfile metadata (package name field).
.github/prompts/opsx-propose.prompt.md	Adds prompt for proposing OpenSpec changes.
.github/prompts/opsx-explore.prompt.md	Adds prompt for OpenSpec explore mode.
.github/prompts/opsx-archive.prompt.md	Adds prompt for archiving OpenSpec changes.
.github/prompts/opsx-apply.prompt.md	Adds prompt for applying OpenSpec changes.
project_template/slides.md	Adds Slidev project template slides.
project_template/package.json	Adds Slidev project template package config.

Files not reviewed (1)

.github/release/package-lock.json: Generated file

    Firebolt::Error connect(std::string url, MessageCallback onMessage, ConnectionCallback onConnectionChange,
                            std::optional<unsigned> transportLoggingInclude = std::nullopt,
-                            std::optional<unsigned> transportLoggingExclude = std::nullopt);
+                            std::optional<unsigned> transportLoggingExclude = std::nullopt,
+                            const std::map<std::string, std::string>& headers = {});


+std::optional<std::string> Transport::getResponseHeader(const std::string& headerName)
+{
+    std::lock_guard<std::mutex> lock(responseHeadersMutex_);
+    auto it = responseHeaders_.find(headerName);
+    if (it != responseHeaders_.end())
+    {
+        return it->second;
+    }
+    return std::nullopt;
+}


+    auto customHeader = transport.getResponseHeader("X-Test-Header");
+    // Custom header may not be echoed by server, but should not crash
+    EXPECT_TRUE(customHeader == std::nullopt || customHeader.has_value());
+


+---
+
+# Connection Protocol
+
+The Firebolt Transport Layer uses WebSocket as its underlying transport, with JSON-RPC layered on top for structured messaging and event notifications.


@@ -0,0 +1,18 @@
+{
+  "name": "openspec-with-copliot-experience",


+MIT License
+
+Copyright (c) YEAR COPYRIGHT HOLDER
+


satlead and others added 30 commits March 10, 2026 01:03

feat: Openspec init

469da7f

feat: Add specs

86468d6

feat: Refactor language specific information

92681e0

feat: Header support proposal

f40da18

feat: Add headers field to Config Struct

3b4e6cd

feat: Add Header support for connect method

5310b34

feat: Implement getResponseHeader and thread safety

b333fd6

feat: Add Unittest and integration tests

aac9015

Merge branch 'main' of github.com:rdkcentral/firebolt-cpp-transport i…

3c8e9c1

…nto feature/openspec

style: clang formatter

9da6d90

fix: Compilation errors

837a962

refactor: Change support for headers

6fe772c

Revert "refactor: Change support for headers"

1c53afc

This reverts commit 6fe772c.

feat: Add Documentation

754c4fe

feat: Fix to use opsx commands

009f2a5

feat: Archive the changes for header support

c2054c9

feat: slidev updates

13bd09a

fix: Fix Header

858e903

Fix: Slides

bf2de87

fix: Changes

75a249e

feat: Final touches and PDF generation

c20138c

feat: Slide update

7e1a16a

feat: Before Standard

529cd21

Feat: Open Spec coverage

1033a23

fix: Add support for Covered code section

c03fe8d

fix: Covered code section branch

bf75a3c

Fix: regex

7ade962

Fix: Proposal format rules

6648276

Merge branch 'develop' of github.com:rdkcentral/firebolt-cpp-transpor…

3ddb44c

…t into openspec-guidelines

Merge branch 'develop' of github-public:rdkcentral/firebolt-cpp-trans…

ffba529

…port into openspec-guidelines

brendanobra and others added 19 commits June 16, 2026 10:21

Potential fix for pull request finding

fb11e34

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

2f1aef6

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

cea889a

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

3a02b5e

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

7ad4741

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

159a1c7

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

7e571bb

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

6be87d8

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

4a0350e

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

1ba08f0

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

878ef95

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

7820148

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

cf99982

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

f0ed7f4

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

f8f44ed

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

61a7452

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Merge pull request #91 from rdkcentral/openspec-guidelines

c959eb3

feat: Openspec guidelines

Copilot AI review requested due to automatic review settings June 23, 2026 14:04

Copilot started reviewing on behalf of tomasz-blasz June 23, 2026 14:04 View session

Copilot AI reviewed Jun 23, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

chore: auto-sync develop → main (merge conflict)#96

chore: auto-sync develop → main (merge conflict)#96
tomasz-blasz wants to merge 49 commits into
mainfrom
auto-sync/develop-to-main

tomasz-blasz commented Jun 23, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		@@ -0,0 +1,18 @@
		{
		"name": "openspec-with-copliot-experience",

Uh oh!

Conversation

tomasz-blasz commented Jun 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants